X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2FMETA-INF%2Fspring%2Fcommon.xml;h=737f30430f1de0eb82592c291808f9d754fd163f;hb=5defecab287b9730db6686ced952b53b8956135a;hp=3a6f8141cf82a8544f1c30a6b4e4cd3721e4239c;hpb=fb4f7c451ea7d9025f7cf7fe032020f229df794a;p=lgpl%2Fargeo-commons.git

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 3a6f8141c..737f30430 100644
--- 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"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">
-		<property name="repository" ref="nodeRepository" />
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="locations">
+			<value>osgibundle:security-admin.properties</value>
+		</property>
 	</bean>
+
+	<!-- FIXME Hard-coded dependency to Jackrabbit for user management -->
+	<bean name="jcrSecurityModel" class="org.argeo.security.jackrabbit.JackrabbitSecurityModel" />
+
+	<!-- Old deprecated way. -->
+	<!-- <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession"> 
+		<property name="repository" ref="nodeRepository" /> </bean> -->
 </beans>
\ No newline at end of file