cleanup webapp-js due to xmlrpc modules removed

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1215264 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 9e6801c84a4b401c059543f0e532d8a3ffd18cb2..8c6e9d465ce6ef372dff6259fb8aacb1743db92f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -246,29 +246,6 @@
       <groupId>org.apache.archiva</groupId>\r
       <artifactId>archiva-rss</artifactId>\r
     </dependency>\r
-    <dependency>\r
-      <groupId>org.apache.archiva</groupId>\r
-      <artifactId>archiva-xmlrpc-api</artifactId>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.apache.archiva</groupId>\r
-      <artifactId>archiva-xmlrpc-services</artifactId>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.apache.archiva</groupId>\r
-      <artifactId>archiva-xmlrpc-security</artifactId>\r
-    </dependency>\r
-\r
-    <dependency>\r
-      <groupId>org.codehaus.redback</groupId>\r
-      <artifactId>redback-xmlrpc-services</artifactId>\r
-      <scope>runtime</scope>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.codehaus.redback</groupId>\r
-      <artifactId>redback-xmlrpc-security</artifactId>\r
-      <scope>runtime</scope>\r
-    </dependency>\r
 \r
     <dependency>\r
 \r

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
index 8437805a049373ab783e018eccc20f43ff587289..656de5f0f44b887fdd1720654ed490e9cecd3235 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
@@ -45,106 +45,6 @@
   <!-- TODO olamy need to find a more dynamic way if using jcr impl -->
   <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
 
-
-  <bean name="xmlRpcUserRepositories" class="org.apache.archiva.web.xmlrpc.security.XmlRpcUserRepositories">
-    <constructor-arg ref="userRepositories"/>
-    <constructor-arg ref="xmlRpcAuthenticator"/>
-  </bean>
-
-  <!--  Web Service : Ping Service -->
-  <bean name="pingService" lazy-init="true" scope="singleton"
-        class="org.apache.archiva.web.xmlrpc.services.PingServiceImpl"/>
-
-
-  <!-- Web Services : Search Service -->
-  <bean name="searchService" lazy-init="true" scope="singleton"
-        class="org.apache.archiva.web.xmlrpc.services.SearchServiceImpl">
-    <constructor-arg ref="xmlRpcUserRepositories"/>
-    <constructor-arg ref="repositorySessionFactory"/>
-    <constructor-arg ref="nexusSearch"/>
-  </bean>
-
-
-
-  <!-- Web Services : Administration Service -->
-  <bean name="administrationService" lazy-init="true" scope="singleton"
-        class="org.apache.archiva.web.xmlrpc.services.AdministrationServiceImpl">
-    <constructor-arg ref="archivaAdministration#default"/>
-    <constructor-arg ref="repositoryContentConsumers"/>
-    <constructor-arg ref="repositoryContentFactory#default"/>
-    <constructor-arg ref="repositorySessionFactory"/>
-    <constructor-arg ref="archivaTaskScheduler#repository"/>
-    <constructor-arg>
-      <bean class="org.apache.archiva.web.spring.RepositoryListenerFactoryBean"/>
-    </constructor-arg>
-    <constructor-arg ref="repositoryStatisticsManager"/>
-    <constructor-arg ref="repositoryMerger#maven2"/>
-    <constructor-arg ref="auditListener#logging"/>
-    <constructor-arg ref="managedRepositoryAdmin#default"/>
-    <constructor-arg ref="remoteRepositoryAdmin#default"/>
-    <constructor-arg ref="proxyConnectorAdmin#default"/>
-    <constructor-arg ref="repositoryGroupAdmin#default"/>
-  </bean>
-
-
-  <!-- Redback Web Services -->
-  <bean name="redbackRoleService" lazy-init="true" scope="singleton"
-        class="org.codehaus.redback.xmlrpc.service.RoleServiceImpl">
-    <constructor-arg ref="rBACManager#cached"/>
-    <constructor-arg ref="roleManager"/>
-  </bean>
-
-  <bean name="redbackOperationService" lazy-init="true" scope="singleton"
-        class="org.codehaus.redback.xmlrpc.service.OperationServiceImpl">
-    <constructor-arg ref="rBACManager#cached"/>
-  </bean>
-
-  <bean name="redbackPermissionService" lazy-init="true" scope="singleton"
-        class="org.codehaus.redback.xmlrpc.service.PermissionServiceImpl">
-    <constructor-arg ref="rBACManager#cached"/>
-  </bean>
-
-  <bean name="redbackResourceService" lazy-init="true" scope="singleton"
-        class="org.codehaus.redback.xmlrpc.service.ResourceServiceImpl">
-    <constructor-arg ref="rBACManager#cached"/>
-  </bean>
-
-  <bean name="redbackUserService" lazy-init="true" scope="singleton"
-        class="org.codehaus.redback.xmlrpc.service.UserServiceImpl">
-    <constructor-arg ref="userManager#cached"/>
-  </bean>
-
-  <bean name="xmlrpcServicesList" lazy-init="true" scope="singleton" class="java.util.ArrayList">
-    <constructor-arg>
-      <list>
-        <ref bean="administrationService"/>
-        <ref bean="searchService"/>
-        <ref bean="pingService"/>
-      </list>
-    </constructor-arg>
-  </bean>
-
-  <bean name="xmlRpcAuthenticator" class="org.apache.archiva.web.xmlrpc.security.XmlRpcAuthenticator">
-    <constructor-arg ref="securitySystem"/>
-    <constructor-arg ref="userRepositories"/>
-  </bean>
-
-  <bean name="redbackXmlrpcServicesList" class="java.util.ArrayList">
-    <constructor-arg>
-      <list>
-        <ref bean="redbackOperationService"/>
-        <ref bean="redbackPermissionService"/>
-        <ref bean="redbackResourceService"/>
-        <ref bean="redbackRoleService"/>
-        <ref bean="redbackUserService"/>
-      </list>
-    </constructor-arg>
-  </bean>
-
-  <bean name="redbackXmlRpcAuthenticator" class="org.codehaus.redback.xmlrpc.security.XmlRpcAuthenticator">
-    <constructor-arg ref="securitySystem"/>
-  </bean>
-
   <bean id="mailSession" class="org.springframework.jndi.JndiObjectFactoryBean">
     <property name="jndiName" value="java:comp/env/mail/Session">
     </property>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
index a89be4580013c3bf47cceb9fe3b6450bf22b694b..bb30d5117460d02a1c662b2fbea3f29f67cfa891 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
@@ -79,42 +79,7 @@
     <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>
-    <init-param>
-      <param-name>enabledForExtensions</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
 
-  <servlet>
-    <servlet-name>RedbackXmlRpcServlet</servlet-name>
-    <servlet-class>com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet</servlet-class>
-    <init-param>
-      <param-name>serviceListBeanName</param-name>
-      <param-value>redbackXmlrpcServicesList</param-value>
-    </init-param>
-    <init-param>
-      <param-name>authHandlerBeanName</param-name>
-      <param-value>redbackXmlRpcAuthenticator</param-value>
-    </init-param>
-    <init-param>
-      <param-name>enabledForExtensions</param-name>
-      <param-value>true</param-value>
-    </init-param>
-  </servlet>
 
   <servlet>
     <servlet-name>RssFeedServlet</servlet-name>
@@ -133,15 +98,7 @@
     <url-pattern>/repository/*</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>XmlRpcServlet</servlet-name>
-    <url-pattern>/xmlrpc</url-pattern>
-  </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>RedbackXmlRpcServlet</servlet-name>
-    <url-pattern>/redback-xmlrpc</url-pattern>
-  </servlet-mapping>
 
   <resource-ref>
     <res-ref-name>jdbc/users</res-ref-name>