X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Forg.argeo.slc.server.repo%2FMETA-INF%2Fspring%2Fservices.xml;h=a4b2c26e02bf5111a9ae02d2b96abaf1539b2639;hb=5f40d8d483bdd509881bf09fa9eedf259146be65;hp=490bf9059fb4333b0d1670770094398d5aa23628;hpb=180e64a5924f51c2396221d2d13f53c183aca7d7;p=gpl%2Fargeo-slc.git

diff --git a/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml b/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml
index 490bf9059..a4b2c26e0 100644
--- a/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml
+++ b/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml
@@ -15,42 +15,47 @@
 		</property>
 	</bean>
 
-	<!-- Maven Proxy -->
-	<bean id="mavenProxyService" class="org.argeo.slc.repo.maven.MavenProxyServiceImpl"
-		init-method="init" destroy-method="destroy" depends-on="ROLE_SLC">
-		<property name="jcrRepository" ref="javaRepository" />
-		<property name="proxyWorkspace" value="${slc.repo.jcr.proxyWorkspace}" />
-		<property name="defaultRepositories" ref="defaultMavenRepositories" />
+	<bean id="slcRepoManager" class="org.argeo.slc.repo.core.SlcRepoManagerImpl"
+		init-method="init" destroy-method="destroy">
+		<property name="javaRepoManager" ref="javaRepoManager" />
 	</bean>
 
-	<bean id="mavenProxyIndexer" class="org.argeo.slc.repo.RepoIndexer"
-		init-method="init" destroy-method="destroy">
-		<property name="jcrRepository" ref="javaRepository" />
-		<property name="workspace" value="${slc.repo.jcr.proxyWorkspace}" />
+	<!-- Java -->
+	<bean id="javaRepoManager" class="org.argeo.slc.repo.core.JavaRepoManagerImpl"
+		init-method="init" destroy-method="destroy" depends-on="ROLE_SLC">
 		<property name="nodeIndexers">
 			<list>
 				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
 				<bean class="org.argeo.slc.repo.JarFileIndexer" />
+				<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
 			</list>
 		</property>
+		<property name="jcrRepository" ref="javaRepository" />
 	</bean>
 
-	<!-- RPM Proxy -->
-	<bean id="rpmProxyService" class="org.argeo.slc.rpmfactory.core.RpmProxyServiceImpl"
+	<bean id="mavenProxyService" class="org.argeo.slc.repo.maven.MavenProxyServiceImpl"
 		init-method="init" destroy-method="destroy" depends-on="ROLE_SLC">
-		<property name="jcrRepository" ref="rpmRepository" />
+		<property name="jcrRepository" ref="javaRepository" />
 		<property name="proxyWorkspace" value="${slc.repo.jcr.proxyWorkspace}" />
-		<property name="defaultRepositories" ref="defaultRpmRepositories" />
+		<property name="defaultRepositories" ref="defaultMavenRepositories" />
 	</bean>
 
-	<bean id="rpmProxyIndexer" class="org.argeo.slc.repo.RepoIndexer"
-		init-method="init" destroy-method="destroy">
-		<property name="jcrRepository" ref="rpmRepository" />
-		<property name="workspace" value="${slc.repo.jcr.proxyWorkspace}" />
+	<!-- RPM -->
+	<bean id="rpmRepoManager" class="org.argeo.slc.repo.core.RpmRepoManagerImpl"
+		init-method="init" destroy-method="destroy" depends-on="ROLE_SLC">
 		<property name="nodeIndexers">
 			<list>
 				<bean class="org.argeo.slc.repo.RpmIndexer" />
 			</list>
 		</property>
+		<property name="jcrRepository" ref="rpmRepository" />
+	</bean>
+
+	<bean id="rpmProxyService" class="org.argeo.slc.rpmfactory.core.RpmProxyServiceImpl"
+		init-method="init" destroy-method="destroy" depends-on="ROLE_SLC">
+		<property name="jcrRepository" ref="rpmRepository" />
+		<property name="proxyWorkspace" value="${slc.repo.jcr.proxyWorkspace}" />
+		<property name="defaultRepositories" ref="defaultRpmRepositories" />
 	</bean>
 </beans>
\ No newline at end of file