Clean and refactor cms.ui.workbench bundle

[lgpl/argeo-commons.git] / org.argeo.cms.ui.workbench / META-INF / spring / common.xml

diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/common.xml b/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
index f3b7ecb01c1d94ef62be53ab317dcde9797a633a..ff4304d16d39d8fbbb91f58376bfd2f05ff8335b 100644 (file)
--- a/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
@@ -4,24 +4,24 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
        <bean id="userTransactionProvider"\r
-               class="org.argeo.security.ui.admin.internal.providers.UserTransactionProvider"\r
+               class="org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTransactionProvider"\r
                scope="singleton" lazy-init="false">\r
                <property name="userTransaction" ref="userTransaction" />\r
        </bean>\r
 \r
-       <bean id="userAdminWrapper" class="org.argeo.security.ui.admin.internal.UserAdminWrapper"\r
+       <bean id="userAdminWrapper" class="org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper"\r
                scope="singleton" lazy-init="false">\r
                <property name="userTransaction" ref="userTransaction" />\r
                <property name="userAdmin" ref="userAdmin" />\r
                <property name="userAdminServiceReference" ref="userAdmin" />\r
        </bean>\r
 \r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
-               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />\r
-               <property name="locations">\r
-                       <value>osgibundle:security-admin.properties</value>\r
-               </property>\r
-       </bean>\r
+<!--   <bean -->\r
+<!--           class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> -->\r
+<!--           <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" /> -->\r
+<!--           <property name="locations"> -->\r
+<!--                   <value>osgibundle:keyring.properties</value> -->\r
+<!--           </property> -->\r
+<!--   </bean> -->\r
 \r
 </beans>
\ No newline at end of file