git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1215189 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M3
@@ -171,18 +171,6 @@ | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-rss</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-xmlrpc-api</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>org.apache.archiva</groupId> | |||
<artifactId>archiva-rest-services</artifactId> | |||
@@ -468,16 +456,7 @@ | |||
<groupId>org.codehaus.redback</groupId> | |||
<artifactId>redback-common-integrations</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.codehaus.redback</groupId> | |||
<artifactId>redback-xmlrpc-services</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.codehaus.redback</groupId> | |||
<artifactId>redback-xmlrpc-security</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.codehaus.redback</groupId> | |||
<artifactId>redback-keys-memory</artifactId> | |||
@@ -632,11 +611,7 @@ | |||
<!-- provided by jcl-over-slf4j, don't want this in the webapp --> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.atlassian.xmlrpc</groupId> | |||
<artifactId>atlassian-xmlrpc-binder-server-spring</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>metadata-model</artifactId> |
@@ -56,103 +56,13 @@ | |||
</property> | |||
</bean> | |||
--> | |||
<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> | |||
<alias name="repositoryStatisticsManager#default" alias="repositoryStatisticsManager"/> | |||
<!-- TODO olamy need to find a more dynamic way if using jcr impl --> | |||
<alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/> | |||
<!-- 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"> |
@@ -111,42 +111,6 @@ | |||
<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> | |||
@@ -165,15 +129,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> |
@@ -413,21 +413,7 @@ | |||
<artifactId>archiva-rss</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-xmlrpc-api</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-xmlrpc-services</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-xmlrpc-security</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>stage-repository-merge</artifactId> | |||
@@ -1197,39 +1183,7 @@ | |||
<version>${jettyVersion}</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> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.atlassian.xmlrpc</groupId> | |||
<artifactId>atlassian-xmlrpc-binder-client-apache</artifactId> | |||
<version>${binder.version}</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
<artifactId>commons-logging</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>commons-validator</groupId> | |||
<artifactId>commons-validator</artifactId> | |||
@@ -1246,12 +1200,7 @@ | |||
<artifactId>oro</artifactId> | |||
<version>2.0.8</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.atlassian.xmlrpc</groupId> | |||
<artifactId>atlassian-xmlrpc-binder-testing</artifactId> | |||
<version>${binder.version}</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<!-- JCR --> | |||
<dependency> | |||
@@ -1433,19 +1382,6 @@ | |||
</dependency> | |||
</dependencies> | |||
<repositories> | |||
<!-- TODO: remove when com.atlassian.xmlrpc:atlassian-xmlrpc-binder-annotations:0.11 will be in central --> | |||
<repository> | |||
<id>maven.atlassian</id> | |||
<url>https://maven.atlassian.com/content/groups/public</url> | |||
<releases> | |||
<enabled>true</enabled> | |||
</releases> | |||
<snapshots> | |||
<enabled>false</enabled> | |||
</snapshots> | |||
</repository> | |||
</repositories> | |||
<build> | |||
<plugins> |