git-svn-id: https://svn.argeo.org/slc/trunk@6893 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

[gpl/argeo-slc.git] / modules / org.argeo.slc.server.repo / META-INF / spring / services.xml

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 490bf9059fb4333b0d1670770094398d5aa23628..93fb545b146d7e1700c65b09e86ee63436109047 100644 (file)
--- 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,46 @@
                </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.DistributionBundleIndexer" />
                        </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