o updated applicationContext

o removed sys out

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index ae629d574d0ca389dea8de304f59c39c549361e8..1df527c0508fed3860793cb931ca10420c290d79 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -63,8 +63,12 @@
   </bean> 
 
   <bean name="xmlrpcServicesList" lazy-init="true" scope="singleton" class="java.util.ArrayList">
-    <constructor-arg ref="administrationService"/>
-    <!--  <constructor-arg ref="searchService"/>   -->
+    <constructor-arg>
+      <list>
+        <ref bean="administrationService"/>
+        <ref bean="searchService"/>
+      </list>
+    </constructor-arg>
   </bean>
     
   <bean name="xmlRpcAuthenticator" class="org.apache.archiva.web.xmlrpc.security.XmlRpcAuthenticator">

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/XmlRpcAuthenticator.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/XmlRpcAuthenticator.java
index de7419e58426f0b4d772fc9ab5fb1cc18cb75269..2a72ab6be1d83932f611b0a79d1e6d93f2179e68 100644 (file)
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/XmlRpcAuthenticator.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/XmlRpcAuthenticator.java
@@ -62,8 +62,6 @@ public class XmlRpcAuthenticator
     public boolean isAuthorized( XmlRpcRequest pRequest )\r
         throws XmlRpcException\r
     {   \r
-        System.out.println( "authenticator is called for request '" + pRequest.getMethodName() + "'" );\r
-        \r
         if ( pRequest.getConfig() instanceof XmlRpcHttpRequestConfigImpl )\r
         {\r
             XmlRpcHttpRequestConfigImpl config = (XmlRpcHttpRequestConfigImpl) pRequest.getConfig();\r