X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.os%2FMETA-INF%2Fspring%2Fsecurity-os.xml;h=3e155626370ebda1cb0843e5f05a9d11882fe8e3;hb=3baeb167c9a92d1f915904bb956632c0aff65b2b;hp=33b4be32fe18d3d4a63b58a6028169548363921e;hpb=0f82096aecc32f674336405cb52f7796ed29d23c;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.dao.os/META-INF/spring/security-os.xml b/security/modules/org.argeo.security.dao.os/META-INF/spring/security-os.xml
index 33b4be32f..3e1556263 100644
--- a/security/modules/org.argeo.security.dao.os/META-INF/spring/security-os.xml
+++ b/security/modules/org.argeo.security.dao.os/META-INF/spring/security-os.xml
@@ -11,7 +11,7 @@
 		</property>
 	</bean>
 
-	<bean id="argeoDataModel" class="org.argeo.jackrabbit.JackrabbitContainer"
+	<bean id="argeoDataModel" class="org.argeo.jackrabbit.JackrabbitWrapper"
 		init-method="init" destroy-method="destroy">
 		<description><![CDATA[Make sure that Argeo base data model is registered]]></description>
 		<property name="cndFiles">
@@ -23,11 +23,6 @@
 		<property name="bundleContext" ref="bundleContext" />
 	</bean>
 
-	<bean id="systemExecutionService" class="org.argeo.security.core.KeyBasedSystemExecutionService">
-		<property name="authenticationManager" ref="authenticationManager" />
-		<property name="systemAuthenticationKey" value="${argeo.security.systemKey}" />
-	</bean>
-
 	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 			<list>
@@ -41,8 +36,11 @@
 	<bean id="osJcrAuthenticationProvider" class="org.argeo.security.jcr.OsJcrAuthenticationProvider"
 		init-method="init" destroy-method="destroy" depends-on="argeoDataModel">
 		<property name="repository" ref="nodeRepository" />
+		<property name="jcrSecurityModel" ref="jcrSecurityModel" />
 	</bean>
 
+	<bean name="jcrSecurityModel" class="org.argeo.security.jackrabbit.JackrabbitSecurityModel" />
+
 	<bean id="authByAdapterProvider"
 		class="org.springframework.security.adapters.AuthByAdapterProvider">
 		<description><![CDATA[System authentication]]></description>
@@ -67,4 +65,10 @@
 		<property name="authenticationManager" ref="internalAuthenticationManager" />
 	</bean>
 
+	<!-- Dummy user manager -->
+	<bean id="userDetailsManager" class="org.argeo.security.jcr.OsJcrUserAdminService"
+		init-method="init" destroy-method="destroy">
+		<property name="repository" ref="nodeRepository" />
+	</bean>
+
 </beans>
\ No newline at end of file