Merge from commons 1.2.x, see following bugs:

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui.admin / META-INF / spring / common.xml

diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml
index 3a6f8141cf82a8544f1c30a6b4e4cd3721e4239c..bb669427a977b0cd5a2cc77ead3c9603abbb246f 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml
+++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml
@@ -3,7 +3,18 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\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
+\r
        <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">\r
                <property name="repository" ref="nodeRepository" />\r
        </bean>\r
+\r
+       <bean name="jcrSecurityModel" class="org.argeo.security.jackrabbit.JackrabbitSecurityModel" />\r
+\r
 </beans>
\ No newline at end of file