Adapt after refactoring

git-svn-id: https://svn.argeo.org/slc/trunk@9170 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 84b32268e008d71cf4afce12388750c973d81d6a..7f2f8b40593dc367851f164bddf62dd9a38fae76 100644 (file)
--- 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 @@
 \r
 \r
        <bean\r
-               class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">\r
+               class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization">\r
 <!--           <property name="authenticationManager" ref="authenticationManager" /> -->\r
        </bean>\r
 \r

diff --git a/org.argeo.slc.agent/META-INF/spring/osgi.xml b/org.argeo.slc.agent/META-INF/spring/osgi.xml
index 42ea0bc77210a04343186ae687d98f2116af0cd8..b3e9aebe267c23ca448b6a8ce037455959f1a67f 100644 (file)
--- 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" />\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 class="org.argeo.security.core.SimpleRoleRegistration"\r
+       <beans:bean class="org.argeo.cms.spring.SimpleRoleRegistration"\r
                init-method="run">\r
                <beans:property name="role" value="org.argeo.slc.user" />\r
                <beans:property name="userAdmin" ref="userAdmin" />\r

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 02e8b2e5ff507b8cba035e111cb26be882133502..5163a3c66ab574fa9a391bb4ec94c8547ad045f8 100644 (file)
--- 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 7ba658464da5b2eff082868bb65348b1cebbbec4..2ef96232da908cb677cbfd67dd3cd5858b770832 100644 (file)
--- 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> -->\r
 \r
        <bean id="template.jcrAuthorizations" abstract="true"\r
-               class="org.argeo.jcr.security.JcrAuthorizations" init-method="run">\r
+               class="org.argeo.jcr.JcrAuthorizations" init-method="run">\r
                <property name="principalPrivileges">\r
                        <map>\r
                                <entry key="jcr:all" value="org.argeo.slc.user" />\r

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..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
@@ -52,20 +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
        <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