X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server.repo%2FMETA-INF%2Fspring%2Frepo-osgi.xml;h=830303ccec94d50f1944c1769d05eb98e1f7698b;hb=8c9a74c1042d811423d65140cb6f69d472ebe462;hp=1da4dba75e4c189ef0ce265fb43f4a770c4f1576;hpb=84437a05db3a30078f43a049fffcf9626f891c9f;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 1da4dba75..830303cce 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
@@ -16,56 +16,35 @@
 		interface="org.argeo.slc.rpmfactory.RpmRepository" />
 
 	<reference id="javaRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=java)" />
+		filter="(cn=java)" />
 	<reference id="distRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=dist)" />
+		filter="(cn=dist)" />
 	<reference id="rpmRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=rpm)" />
+		filter="(cn=rpm)" />
 	<reference id="docsRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=docs)" />
+		filter="(cn=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="slcRepoManager" interface="org.argeo.slc.repo.SlcRepoManager" />
 
-	<service ref="mavenProxyService" interface="org.argeo.slc.repo.MavenProxyService" />
-	<service ref="rpmProxyService" interface="org.argeo.slc.rpmfactory.RpmProxyService" />
+<!-- 	<service ref="mavenProxyService" interface="org.argeo.slc.repo.MavenProxyService" /> -->
+<!-- 	<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>