X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.server.repo.webapp%2FWEB-INF%2Fmaven-servlet.xml;h=04d5151f04e11e2c14d4836bd3a1614951d99a7a;hb=868102c0f0220e12eca836b6ec9b3a2b9a3441e4;hp=0c0d817e32d1d8089518a03b9259126e29d26149;hpb=10dd7ee7dc2bdd8d3bc39e8873a9080debfcd8e5;p=gpl%2Fargeo-slc.git

diff --git a/modules/server/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml b/modules/server/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml
index 0c0d817e3..04d5151f0 100644
--- a/modules/server/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml
+++ b/modules/server/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml
@@ -22,53 +22,12 @@
 		</property>
 	</bean>
 
-	<bean id="mavenProxyService" class="org.argeo.slc.repo.maven.proxy.MavenProxyServiceImpl"
-		init-method="init" destroy-method="destroy">
-		<property name="jcrRepository" ref="jcrRepository" />
-		<property name="defaultRepositories" ref="defaultMavenRepositories" />
-	</bean>
-
-	<bean id="mavenProxyServlet" class="org.argeo.slc.repo.maven.proxy.MavenProxyServlet">
+	<bean id="mavenProxyServlet" class="org.argeo.jcr.mvc.ResourceProxyServlet">
 		<property name="jcrSession" ref="jcrSession" />
-		<property name="proxyService" ref="mavenProxyService" />
+		<property name="proxy" ref="mavenProxy" />
 	</bean>
 
 	<bean id="jcrSession" class="org.argeo.security.jcr.SecureThreadBoundSession">
 		<property name="repository" ref="jcrRepository" />
-		<property name="defaultUsername" value="root" />
-		<property name="defaultPassword" value="demo" />
 	</bean>
-
-	<bean
-		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-		<property name="authenticationManager" ref="authenticationManager" />
-	</bean>
-
-	<!-- Remote repositories -->
-	<util:list id="defaultMavenRepositories">
-		<ref local="central" />
-		<ref local="com.springsource.repository.bundles.external" />
-		<ref local="com.springsource.repository.bundles.release" />
-		<ref local="argeo" />
-		<ref local="argeo-snapshots" />
-	</util:list>
-
-	<bean id="central" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-		<property name="url" value="http://repo1.maven.org/maven2" />
-	</bean>
-	<bean id="com.springsource.repository.bundles.release" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-		<property name="url"
-			value="http://repository.springsource.com/maven/bundles/release" />
-	</bean>
-	<bean id="com.springsource.repository.bundles.external" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-		<property name="url"
-			value="http://repository.springsource.com/maven/bundles/external" />
-	</bean>
-	<bean id="argeo" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-		<property name="url" value="http://maven.argeo.org/argeo/" />
-	</bean>
-	<bean id="argeo-snapshots" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-		<property name="url" value="http://dev.argeo.org/maven/argeo-snapshots/" />
-	</bean>
-
 </beans>
\ No newline at end of file