X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server.repo%2FMETA-INF%2Fspring%2Frepo-osgi.xml;h=af033c6f1e511777d2260e7fcecf63b62529154a;hb=143b59d83472940d26d4fa5db3030ab1e3bf8f8f;hp=c821088da62341e4f74cfbac8715ad36b76fbbf3;hpb=c17b3666a01eb9e34d93861be01babb397fb05e4;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index c821088da..af033c6f1 100644
--- a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -15,27 +15,36 @@
 	<set id="defaultRpmRepositories" cardinality="0..N"
 		interface="org.argeo.slc.rpmfactory.RpmRepository" />
 
+	<reference id="javaRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=java)" />
+	<reference id="distRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=dist)" />
+	<reference id="rpmRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=rpm)" />
+	<reference id="docsRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=docs)" />
+
 	<!-- SERVICES -->
-	<service ref="javaRepository" interface="javax.jcr.Repository">
-		<service-properties>
-			<beans:entry key="argeo.jcr.repository.alias" value="java" />
-		</service-properties>
-	</service>
-	<service ref="distRepository" interface="javax.jcr.Repository">
-		<service-properties>
-			<beans:entry key="argeo.jcr.repository.alias" value="dist" />
-		</service-properties>
-	</service>
-	<service ref="rpmRepository" interface="javax.jcr.Repository">
-		<service-properties>
-			<beans:entry key="argeo.jcr.repository.alias" value="rpm" />
-		</service-properties>
-	</service>
-	<service ref="docsRepository" interface="javax.jcr.Repository">
-		<service-properties>
-			<beans:entry key="argeo.jcr.repository.alias" value="docs" />
-		</service-properties>
-	</service>
+<!-- 	<service ref="javaRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="java" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="distRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="dist" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="rpmRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="rpm" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="docsRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="docs" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
 
 	<service ref="slcRepoManager" interface="org.argeo.slc.repo.SlcRepoManager" />
 
@@ -43,20 +52,20 @@
 	<service ref="rpmProxyService" interface="org.argeo.slc.rpmfactory.RpmProxyService" />
 
 	<!-- LABEL -->
-	<beans:bean class="org.argeo.security.core.OsgiModuleLabel">
+	<beans:bean class="org.argeo.cms.spring.osgi.OsgiModuleLabel">
 		<beans:property name="bundleContext" ref="bundleContext" />
 	</beans:bean>
 
 	<!-- ROLES -->
 	<beans:bean id="ROLE_SLC"
-		class="org.argeo.security.core.SimpleRoleRegistration" init-method="run">
+		class="org.argeo.cms.spring.SimpleRoleRegistration" init-method="run">
 		<beans:property name="role" value="org.argeo.slc.user" />
 		<beans:property name="userAdmin" ref="userAdmin" />
 		<beans:property name="userTransaction" ref="userTransaction" />
 	</beans:bean>
 
 	<beans:bean
-		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
+		class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization">
 	</beans:bean>
 </beans:beans>