Adapt after refactoring

[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 aaaa924f04427170bf08ea432662c112d38ef4ef..af033c6f1e511777d2260e7fcecf63b62529154a 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
@@ -9,33 +9,42 @@
        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">\r
 \r
        <!-- REFERENCES -->\r
-       <reference id="authenticationManager"\r
-               interface="org.springframework.security.authentication.AuthenticationManager" />\r
+       <reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />\r
+       <reference id="userTransaction" interface="javax.transaction.UserTransaction" />\r
 \r
        <set id="defaultRpmRepositories" cardinality="0..N"\r
                interface="org.argeo.slc.rpmfactory.RpmRepository" />\r
 \r
+       <reference id="javaRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=java)" />\r
+       <reference id="distRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=dist)" />\r
+       <reference id="rpmRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=rpm)" />\r
+       <reference id="docsRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=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
+<!--   <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
@@ -43,22 +52,20 @@
        <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
-       <reference id="userAdminService" interface="org.argeo.security.UserAdminService" />\r
-\r
        <beans:bean id="ROLE_SLC"\r
-               class="org.argeo.security.core.SimpleRoleRegistration" init-method="run">\r
-               <beans:property name="role" value="ROLE_SLC" />\r
-               <beans:property name="userAdminService" ref="userAdminService" />\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
-               <beans:property name="authenticationManager" ref="authenticationManager" />\r
+               class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization">\r
        </beans:bean>\r
 </beans:beans>\r
 \r