Use released Argeo Commons

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

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 1da4dba75e4c189ef0ce265fb43f4a770c4f1576..830303ccec94d50f1944c1769d05eb98e1f7698b 100644 (file)
--- 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" />\r
 \r
        <reference id="javaRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=java)" />\r
+               filter="(cn=java)" />\r
        <reference id="distRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=dist)" />\r
+               filter="(cn=dist)" />\r
        <reference id="rpmRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=rpm)" />\r
+               filter="(cn=rpm)" />\r
        <reference id="docsRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=docs)" />\r
+               filter="(cn=docs)" />\r
 \r
        <!-- SERVICES -->\r
-<!--   <service ref="javaRepository" interface="javax.jcr.Repository"> -->\r
-<!--           <service-properties> -->\r
-<!--                   <beans:entry key="argeo.jcr.repository.alias" value="java" /> -->\r
-<!--           </service-properties> -->\r
-<!--   </service> -->\r
-<!--   <service ref="distRepository" interface="javax.jcr.Repository"> -->\r
-<!--           <service-properties> -->\r
-<!--                   <beans:entry key="argeo.jcr.repository.alias" value="dist" /> -->\r
-<!--           </service-properties> -->\r
-<!--   </service> -->\r
-<!--   <service ref="rpmRepository" interface="javax.jcr.Repository"> -->\r
-<!--           <service-properties> -->\r
-<!--                   <beans:entry key="argeo.jcr.repository.alias" value="rpm" /> -->\r
-<!--           </service-properties> -->\r
-<!--   </service> -->\r
-<!--   <service ref="docsRepository" interface="javax.jcr.Repository"> -->\r
-<!--           <service-properties> -->\r
-<!--                   <beans:entry key="argeo.jcr.repository.alias" value="docs" /> -->\r
-<!--           </service-properties> -->\r
-<!--   </service> -->\r
-\r
        <service ref="slcRepoManager" interface="org.argeo.slc.repo.SlcRepoManager" />\r
 \r
-       <service ref="mavenProxyService" interface="org.argeo.slc.repo.MavenProxyService" />\r
-       <service ref="rpmProxyService" interface="org.argeo.slc.rpmfactory.RpmProxyService" />\r
+<!--   <service ref="mavenProxyService" interface="org.argeo.slc.repo.MavenProxyService" /> -->\r
+<!--   <service ref="rpmProxyService" interface="org.argeo.slc.rpmfactory.RpmProxyService" /> -->\r
 \r
        <!-- LABEL -->\r
-       <beans:bean class="org.argeo.security.core.OsgiModuleLabel">\r
+       <beans:bean class="org.argeo.cms.spring.osgi.OsgiModuleLabel">\r
                <beans:property name="bundleContext" ref="bundleContext" />\r
        </beans:bean>\r
 \r
        <!-- ROLES -->\r
        <beans:bean id="ROLE_SLC"\r
-               class="org.argeo.security.core.SimpleRoleRegistration" init-method="run">\r
+               class="org.argeo.cms.spring.SimpleRoleRegistration" init-method="run">\r
                <beans:property name="role" value="org.argeo.slc.user" />\r
                <beans:property name="userAdmin" ref="userAdmin" />\r
                <beans:property name="userTransaction" ref="userTransaction" />\r
        </beans:bean>\r
 \r
        <beans:bean\r
-               class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">\r
+               class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization">\r
        </beans:bean>\r
 </beans:beans>\r
 \r