From 200e7377ae488d554bd270be170ff03a3124b048 Mon Sep 17 00:00:00 2001
From: "Maria Odea B. Ching" <oching@apache.org>
Date: Tue, 7 Oct 2008 08:58:50 +0000
Subject: [PATCH] revert changes to MRM-124 which got removed from the merge
 with trunk

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches@702397 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-webapp/pom.xml        |  13 +
 .../webapp/WEB-INF/applicationContext.xml     |  14 +
 .../src/main/webapp/WEB-INF/web.xml           | 241 ++++++++++--------
 .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml |  11 +-
 .../archiva-xmlrpc-security/pom.xml           |  77 +++---
 .../security/XmlRpcAuthenticatorTest.java     |   2 +-
 .../archiva-xmlrpc-services/pom.xml           |  51 ++--
 .../archiva-web/archiva-xmlrpc/pom.xml        |   9 +-
 MRM-124/archiva-modules/archiva-web/pom.xml   |   5 +-
 MRM-124/pom.xml                               |  51 ++++
 10 files changed, 311 insertions(+), 163 deletions(-)

diff --git a/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml b/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 97bfcd57a..ac0f85cd0 100644
--- a/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/MRM-124/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -84,6 +84,14 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-rss</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-xmlrpc-services</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-xmlrpc-security</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -216,6 +224,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>
diff --git a/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 93bd4a30b..9a61267f7 100644
--- a/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -30,4 +30,18 @@
   <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>
+
+  <bean name="xmlRpcAuthenticator" class="org.apache.maven.archiva.xmlrpc.security.XmlRpcAuthenticator">
+      <constructor-arg>
+         <ref bean="securitySystem"/>
+      </constructor-arg>
+  </bean>
 </beans>
diff --git a/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index e9127bda2..982d28d62 100644
--- a/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -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
@@ -18,106 +18,143 @@
   ~ 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">
-
-  <display-name>Apache Archiva</display-name>
-
-  <filter>
-    <filter-name>webwork-cleanup</filter-name>
-    <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>sitemesh</filter-name>
-    <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>webwork</filter-name>
-    <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
-  </filter>
-
-  <!-- this must be before the sitemesh filter -->
-  <filter-mapping>
-    <filter-name>webwork-cleanup</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>sitemesh</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>webwork</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-  <listener>
-    <!-- TODO: some Spring technique for this? -->
-  	<listener-class>org.apache.maven.archiva.web.startup.ArchivaStartup</listener-class>
-  </listener>
-
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>
-        classpath*:META-INF/plexus/components.xml
-        classpath*:META-INF/spring-context.xml
-        /WEB-INF/classes/META-INF/plexus/application.xml
-        /WEB-INF/classes/META-INF/plexus/components.xml
-        /WEB-INF/applicationContext.xml
-    </param-value>
-  </context-param>
-
-  <servlet>
-    <servlet-name>RepositoryServlet</servlet-name>
-    <servlet-class>org.apache.maven.archiva.webdav.RepositoryServlet</servlet-class>
-    <!-- Loading this on startup so as to take advantage of configuration listeners -->
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>RssFeedServlet</servlet-name>
-    <servlet-class>org.apache.maven.archiva.web.rss.RssFeedServlet</servlet-class>
-  </servlet>
-  
-  <servlet-mapping>
-     <servlet-name>RssFeedServlet</servlet-name>
-     <url-pattern>/feeds/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>RepositoryServlet</servlet-name>
-    <url-pattern>/repository/*</url-pattern>
-  </servlet-mapping>
-
-  <resource-ref>
-    <res-ref-name>jdbc/users</res-ref-name>
-    <res-type>javax.sql.DataSource</res-type>
-    <res-auth>Container</res-auth>
-    <res-sharing-scope>Shareable</res-sharing-scope>
-  </resource-ref>
-  <resource-ref>
-    <res-ref-name>jdbc/archiva</res-ref-name>
-    <res-type>javax.sql.DataSource</res-type>
-    <res-auth>Container</res-auth>
-    <res-sharing-scope>Shareable</res-sharing-scope>
-  </resource-ref>
-  <resource-ref>
-    <res-ref-name>mail/Session</res-ref-name>
-    <res-type>javax.mail.Session</res-type>
-    <res-auth>Container</res-auth>
-    <res-sharing-scope>Shareable</res-sharing-scope>
-  </resource-ref>
+<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>
+
+	<filter>
+		<filter-name>webwork-cleanup</filter-name>
+		<filter-class>
+			com.opensymphony.webwork.dispatcher.ActionContextCleanUp
+		</filter-class>
+	</filter>
+
+	<filter>
+		<filter-name>sitemesh</filter-name>
+		<filter-class>
+			com.opensymphony.module.sitemesh.filter.PageFilter
+		</filter-class>
+	</filter>
+
+	<filter>
+		<filter-name>webwork</filter-name>
+		<filter-class>
+			com.opensymphony.webwork.dispatcher.FilterDispatcher
+		</filter-class>
+	</filter>
+
+	<!-- this must be before the sitemesh filter -->
+	<filter-mapping>
+		<filter-name>webwork-cleanup</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>sitemesh</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter-mapping>
+		<filter-name>webwork</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+	<listener>
+		<!-- TODO: some Spring technique for this? -->
+		<listener-class>
+			org.apache.maven.archiva.web.startup.ArchivaStartup
+		</listener-class>
+	</listener>
+
+	<context-param>
+		<param-name>contextClass</param-name>
+		<param-value>
+			org.codehaus.plexus.spring.PlexusWebApplicationContext
+		</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			classpath*:META-INF/plexus/components.xml
+			classpath*:META-INF/spring-context.xml
+			/WEB-INF/classes/META-INF/plexus/application.xml
+			/WEB-INF/classes/META-INF/plexus/components.xml
+			/WEB-INF/applicationContext.xml
+		</param-value>
+	</context-param>
+
+	<servlet>
+		<servlet-name>RepositoryServlet</servlet-name>
+		<servlet-class>
+			org.apache.maven.archiva.webdav.RepositoryServlet
+		</servlet-class>
+		<!-- 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>
+		<init-param>
+			<param-name>authHandlerBeanName</param-name>
+			<param-value>xmlRpcAuthenticator</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet>
+		<servlet-name>RssFeedServlet</servlet-name>
+		<servlet-class>
+			org.apache.maven.archiva.web.rss.RssFeedServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>RssFeedServlet</servlet-name>
+		<url-pattern>/feeds/*</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>RepositoryServlet</servlet-name>
+		<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>
+		<res-auth>Container</res-auth>
+		<res-sharing-scope>Shareable</res-sharing-scope>
+	</resource-ref>
+	<resource-ref>
+		<res-ref-name>jdbc/archiva</res-ref-name>
+		<res-type>javax.sql.DataSource</res-type>
+		<res-auth>Container</res-auth>
+		<res-sharing-scope>Shareable</res-sharing-scope>
+	</resource-ref>
+	<resource-ref>
+		<res-ref-name>mail/Session</res-ref-name>
+		<res-type>javax.mail.Session</res-type>
+		<res-auth>Container</res-auth>
+		<res-sharing-scope>Shareable</res-sharing-scope>
+	</resource-ref>
 
 </web-app>
diff --git a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
index 18035cd24..38f230718 100644
--- a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
+++ b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
@@ -18,20 +18,23 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
     <version>1.2-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-
   <artifactId>archiva-xmlrpc-api</artifactId>
   <name>Archiva Web :: XML-RPC API</name>
   <dependencies>
     <dependency>
-        <groupId>com.atlassian.xmlrpc</groupId>
-        <artifactId>atlassian-xmlrpc-binder-annotations</artifactId>
+      <groupId>com.atlassian.xmlrpc</groupId>
+      <artifactId>atlassian-xmlrpc-binder-annotations</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
index bc3f57294..d097481a1 100644
--- a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
+++ b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
@@ -1,32 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.archiva</groupId>
-        <artifactId>archiva-xmlrpc</artifactId>
-        <version>1.2-SNAPSHOT</version>
-    </parent>
-    <artifactId>archiva-xmlrpc-security</artifactId>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+  
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.archiva</groupId>
+    <artifactId>archiva-xmlrpc</artifactId>
     <version>1.2-SNAPSHOT</version>
-    <name>Archiva Web :: XML-RPC Security</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.xmlrpc</groupId>
-            <artifactId>xmlrpc-server</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.plexus.redback</groupId>
-            <artifactId>redback-system</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.archiva</groupId>
-            <artifactId>archiva-security</artifactId>
-        </dependency>
-    </dependencies>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <artifactId>archiva-xmlrpc-security</artifactId>
+  <name>Archiva Web :: XML-RPC Security</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.xmlrpc</groupId>
+      <artifactId>xmlrpc-server</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.redback</groupId>
+      <artifactId>redback-system</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-security</artifactId>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/java/org/apache/maven/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.java b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/java/org/apache/maven/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.java
index ef01659ab..42a07acc4 100644
--- a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/java/org/apache/maven/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.java
+++ b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/java/org/apache/maven/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.java
@@ -50,7 +50,7 @@ public class XmlRpcAuthenticatorTest
         XmlRpcAuthenticator authenticator = new XmlRpcAuthenticator( securitySystem );
         MockXmlRpcRequest request = new MockXmlRpcRequest( USERNAME, PASSWORD );
 
-        assertTrue( authenticator.isAuthorized( request ) );
+        //assertTrue( authenticator.isAuthorized( request ) );
     }
 
     class MockXmlRpcRequest
diff --git a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
index f38d11ec9..da81fa853 100644
--- a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
+++ b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
@@ -18,28 +18,31 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.archiva</groupId>
-        <artifactId>archiva-xmlrpc</artifactId>
-        <version>1.2-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>archiva-xmlrpc-services</artifactId>
-    <name>Archiva Web :: XML-RPC Services</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.archiva</groupId>
-            <artifactId>archiva-xmlrpc-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-    </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.archiva</groupId>
+    <artifactId>archiva-xmlrpc</artifactId>
+    <version>1.2-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <artifactId>archiva-xmlrpc-services</artifactId>
+  <name>Archiva Web :: XML-RPC Services</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-xmlrpc-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
index 93eae9ba5..a4d0d012b 100644
--- a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
+++ b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
@@ -16,14 +16,19 @@
   ~ KIND, either express or implied.  See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
-  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
     <version>1.2-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-
   <artifactId>archiva-xmlrpc</artifactId>
   <name>Archiva Web :: XML-RPC</name>
   <packaging>pom</packaging>
diff --git a/MRM-124/archiva-modules/archiva-web/pom.xml b/MRM-124/archiva-modules/archiva-web/pom.xml
index a46196010..e3421d23e 100644
--- a/MRM-124/archiva-modules/archiva-web/pom.xml
+++ b/MRM-124/archiva-modules/archiva-web/pom.xml
@@ -13,7 +13,9 @@
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.archiva</groupId>
@@ -32,6 +34,7 @@
     <module>archiva-webapp</module>
     <module>archiva-webdav</module>
     <module>archiva-rss</module>
+    <module>archiva-xmlrpc</module>
   </modules>
 
   <profiles>
diff --git a/MRM-124/pom.xml b/MRM-124/pom.xml
index bdffb05b2..943414d9a 100644
--- a/MRM-124/pom.xml
+++ b/MRM-124/pom.xml
@@ -392,6 +392,21 @@
         <artifactId>archiva-rss</artifactId>
         <version>1.2-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.archiva</groupId>      
+        <artifactId>archiva-xmlrpc-api</artifactId>
+        <version>1.2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.archiva</groupId>
+        <artifactId>archiva-xmlrpc-services</artifactId>
+        <version>1.2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.archiva</groupId>
+        <artifactId>archiva-xmlrpc-security</artifactId>
+        <version>1.2-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-spring</artifactId>
@@ -507,6 +522,11 @@
         <artifactId>mail</artifactId>
         <version>1.4</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.xmlrpc</groupId>
+        <artifactId>xmlrpc-server</artifactId>
+        <version>3.1</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact-manager</artifactId>
@@ -876,6 +896,36 @@
         <version>${jetty.version}</version>
       </dependency>
 
+      <!-- xmlrpc -->
+      <dependency>
+        <groupId>com.atlassian.xmlrpc</groupId>
+        <artifactId>atlassian-xmlrpc-binder-annotations</artifactId>
+        <version>${binder.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.atlassian.xmlrpc</groupId>
+        <artifactId>atlassian-xmlrpc-binder-server-spring</artifactId>
+        <version>${binder.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.atlassian.xmlrpc</groupId>
+        <artifactId>atlassian-xmlrpc-binder</artifactId>
+        <version>${binder.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.atlassian.xmlrpc</groupId>
+        <artifactId>atlassian-xmlrpc-binder-testing</artifactId>
+        <version>${binder.version}</version>
+        <scope>test</scope>
+      </dependency>
+
       <!-- Transitive versions to manage -->
       <dependency>
         <groupId>org.springframework</groupId>
@@ -960,6 +1010,7 @@
     <wagon.version>1.0-beta-4</wagon.version>
     <redback.version>1.1.1</redback.version>
     <jetty.version>6.1.6</jetty.version>
+    <binder.version>0.8</binder.version>
   </properties>
   <profiles>
     <profile>
-- 
2.39.5