X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.server.repo%2FMETA-INF%2Fspring%2Frepo-osgi.xml;h=f0fcaaa4f84b99fec1300aff1d8a0bc45857ae9f;hb=ea44d5dd598dac80aa461adeaad708b6a88fb88f;hp=aaaa924f04427170bf08ea432662c112d38ef4ef;hpb=ec89c14b2dfad04791341dafbf43e9b992566fb4;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 aaaa924f0..f0fcaaa4f 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
@@ -9,33 +9,42 @@
        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
 
 	<!-- REFERENCES -->
-	<reference id="authenticationManager"
-		interface="org.springframework.security.authentication.AuthenticationManager" />
+	<reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />
+	<reference id="userTransaction" interface="javax.transaction.UserTransaction" />
 
 	<set id="defaultRpmRepositories" cardinality="0..N"
 		interface="org.argeo.slc.rpmfactory.RpmRepository" />
 
+	<reference id="javaRepository" interface="javax.jcr.Repository"
+		filter="(cn=java)" />
+	<reference id="distRepository" interface="javax.jcr.Repository"
+		filter="(cn=dist)" />
+	<reference id="rpmRepository" interface="javax.jcr.Repository"
+		filter="(cn=rpm)" />
+	<reference id="docsRepository" interface="javax.jcr.Repository"
+		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="javaRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="cn" value="java" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="distRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="cn" value="dist" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="rpmRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="cn" value="rpm" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="docsRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="cn" value="docs" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
 
 	<service ref="slcRepoManager" interface="org.argeo.slc.repo.SlcRepoManager" />
 
@@ -43,22 +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 -->
-	<reference id="userAdminService" interface="org.argeo.security.UserAdminService" />
-
 	<beans:bean id="ROLE_SLC"
-		class="org.argeo.security.core.SimpleRoleRegistration" init-method="run">
-		<beans:property name="role" value="ROLE_SLC" />
-		<beans:property name="userAdminService" ref="userAdminService" />
+		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">
-		<beans:property name="authenticationManager" ref="authenticationManager" />
+		class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization">
 	</beans:bean>
 </beans:beans>