archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdu...@apache.org
Subject svn commit: r691863 - in /archiva/branches/MRM-124: ./ archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/ archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/ archiva-modules/arc...
Date Thu, 04 Sep 2008 03:58:49 GMT
Author: jdumay
Date: Wed Sep  3 20:58:48 2008
New Revision: 691863

URL: http://svn.apache.org/viewvc?rev=691863&view=rev
Log:
XmlRpc servlet works :)

Added:
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/services/
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/services/PingServiceImpl.java
      - copied, changed from r689712, archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/server/services/PingServiceImpl.java
Removed:
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/server/ArchivaRequestProcessorFactoryFactory.java
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/server/ArchivaXmlRpcServlet.java
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/server/services/PingServiceImpl.java
Modified:
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
    archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/pom.xml
    archiva/branches/MRM-124/pom.xml

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=691863&r1=691862&r2=691863&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Sep  3
20:58:48 2008
@@ -85,6 +85,10 @@
       <artifactId>archiva-rss</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-xmlrpc-services</artifactId>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <scope>provided</scope>
@@ -221,6 +225,11 @@
       <artifactId>commons-logging-api</artifactId>
       <version>1.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.atlassian.xmlrpc</groupId>
+      <artifactId>atlassian-xmlrpc-binder-server-spring</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
   <build>
     <resources>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=691863&r1=691862&r2=691863&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Wed Sep  3 20:58:48 2008
@@ -30,4 +30,14 @@
   <bean id="propertyPlaceholder" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     <property name="location" value="classpath:application.properties" />
   </bean>
+
+
+  <bean name="testXmlRpcService" lazy-init="true" scope="singleton" class="org.apache.maven.archiva.web.xmlrpc.services.PingServiceImpl"/>
+
+  <bean name="xmlrpcServicesList" class="java.util.ArrayList">
+    <constructor-arg>
+        <ref bean="testXmlRpcService"/>
+    </constructor-arg>
+  </bean>
+
 </beans>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=691863&r1=691862&r2=691863&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
Wed Sep  3 20:58:48 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
@@ -17,10 +17,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
   <display-name>Apache Archiva</display-name>
 
@@ -85,6 +82,16 @@
     <!-- Loading this on startup so as to take advantage of configuration listeners -->
     <load-on-startup>1</load-on-startup>
   </servlet>
+
+  <servlet>
+    <servlet-name>XmlRpcServlet</servlet-name>
+    <servlet-class>com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet</servlet-class>
+    <init-param>
+        <param-name>serviceListBeanName</param-name>
+        <param-value>xmlrpcServicesList</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
   
   <servlet>
     <servlet-name>RssFeedServlet</servlet-name>
@@ -101,6 +108,11 @@
     <url-pattern>/repository/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>XmlRpcServlet</servlet-name>
+    <url-pattern>/xmlrpc</url-pattern>
+  </servlet-mapping>
+
   <resource-ref>
     <res-ref-name>jdbc/users</res-ref-name>
     <res-type>javax.sql.DataSource</res-type>
@@ -119,5 +131,4 @@
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
-
 </web-app>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/pom.xml?rev=691863&r1=691862&r2=691863&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/pom.xml
(original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/pom.xml
Wed Sep  3 20:58:48 2008
@@ -26,8 +26,8 @@
         <version>1.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>archiva-xmlrpc-server</artifactId>
-    <name>Archiva Web :: XML-RPC Server</name>
+    <artifactId>archiva-xmlrpc-services</artifactId>
+    <name>Archiva Web :: XML-RPC Services</name>
     <dependencies>
         <dependency>
             <groupId>org.apache.archiva</groupId>
@@ -41,9 +41,5 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.atlassian.xmlrpc</groupId>
-            <artifactId>atlassian-xmlrpc-binder-server</artifactId>
-        </dependency>
     </dependencies>
 </project>

Copied: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/services/PingServiceImpl.java
(from r689712, archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/server/services/PingServiceImpl.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/services/PingServiceImpl.java?p2=archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/services/PingServiceImpl.java&p1=archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/server/services/PingServiceImpl.java&r1=689712&r2=691863&rev=691863&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/server/services/PingServiceImpl.java
(original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-server/src/main/java/org/apache/maven/archiva/web/xmlrpc/services/PingServiceImpl.java
Wed Sep  3 20:58:48 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.web.xmlrpc.server.services;
+package org.apache.maven.archiva.web.xmlrpc.services;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: archiva/branches/MRM-124/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/pom.xml?rev=691863&r1=691862&r2=691863&view=diff
==============================================================================
--- archiva/branches/MRM-124/pom.xml (original)
+++ archiva/branches/MRM-124/pom.xml Wed Sep  3 20:58:48 2008
@@ -388,7 +388,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
-        <artifactId>archiva-xmlrpc-server</artifactId>
+        <artifactId>archiva-xmlrpc-services</artifactId>
         <version>1.2-SNAPSHOT</version>        
       </dependency>
       <dependency>
@@ -882,12 +882,12 @@
       <dependency>
         <groupId>com.atlassian.xmlrpc</groupId>
         <artifactId>atlassian-xmlrpc-binder-annotations</artifactId>
-        <version>0.5</version>
+        <version>0.6-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>com.atlassian.xmlrpc</groupId>
-        <artifactId>atlassian-xmlrpc-binder-server</artifactId>
-        <version>0.5</version>
+        <artifactId>atlassian-xmlrpc-binder-server-spring</artifactId>
+        <version>0.6-SNAPSHOT</version>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>
@@ -898,13 +898,13 @@
       <dependency>
         <groupId>com.atlassian.xmlrpc</groupId>
         <artifactId>atlassian-xmlrpc-binder</artifactId>
-        <version>0.5</version>
+        <version>0.6-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.atlassian.xmlrpc</groupId>
         <artifactId>atlassian-xmlrpc-binder-testing</artifactId>
-        <version>0.5</version>
+        <version>0.6-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 



Mime
View raw message