From 143b59d83472940d26d4fa5db3030ab1e3bf8f8f Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 15 Sep 2016 17:51:34 +0000
Subject: [PATCH] Adapt after refactoring

git-svn-id: https://svn.argeo.org/slc/trunk@9170 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml             | 2 +-
 org.argeo.slc.agent/META-INF/spring/osgi.xml                | 4 ++--
 .../META-INF/spring/jackrabbit.xml                          | 4 ++--
 org.argeo.slc.server.repo/META-INF/spring/jcr.xml           | 2 +-
 org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml b/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
index 84b32268e..7f2f8b405 100644
--- a/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
+++ b/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
@@ -34,7 +34,7 @@
 
 
 	<bean
-		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
+		class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization">
 <!-- 		<property name="authenticationManager" ref="authenticationManager" /> -->
 	</bean>
 
diff --git a/org.argeo.slc.agent/META-INF/spring/osgi.xml b/org.argeo.slc.agent/META-INF/spring/osgi.xml
index 42ea0bc77..b3e9aebe2 100644
--- a/org.argeo.slc.agent/META-INF/spring/osgi.xml
+++ b/org.argeo.slc.agent/META-INF/spring/osgi.xml
@@ -39,14 +39,14 @@
 	<service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />
 
 	<!-- 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 class="org.argeo.security.core.SimpleRoleRegistration"
+	<beans:bean class="org.argeo.cms.spring.SimpleRoleRegistration"
 		init-method="run">
 		<beans:property name="role" value="org.argeo.slc.user" />
 		<beans:property name="userAdmin" ref="userAdmin" />
diff --git a/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml b/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
index 02e8b2e5f..5163a3c66 100644
--- a/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
+++ b/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
@@ -15,7 +15,7 @@
 	<!-- </bean> -->
 
 	<!-- Security -->
-	<bean class="org.argeo.jcr.security.JcrAuthorizations"
+	<bean class="org.argeo.jcr.JcrAuthorizations"
 		init-method="run">
 		<property name="principalPrivileges">
 			<map>
@@ -26,7 +26,7 @@
 	</bean>
 
 	<bean
-		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
+		class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization">
 		<description><![CDATA[Executes initialization with a system authentication]]></description>
 		<!-- <property name="authenticationManager" ref="authenticationManager" 
 			/> -->
diff --git a/org.argeo.slc.server.repo/META-INF/spring/jcr.xml b/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
index 7ba658464..2ef96232d 100644
--- a/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
@@ -61,7 +61,7 @@
 	<!-- </bean> -->
 
 	<bean id="template.jcrAuthorizations" abstract="true"
-		class="org.argeo.jcr.security.JcrAuthorizations" init-method="run">
+		class="org.argeo.jcr.JcrAuthorizations" init-method="run">
 		<property name="principalPrivileges">
 			<map>
 				<entry key="jcr:all" value="org.argeo.slc.user" />
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..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
@@ -52,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>
 
-- 
2.39.2