Add dep folder

[lgpl/argeo-commons.git] / security / modules / org.argeo.security.dao.os / META-INF / spring / security-os.xml

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 33b4be32fe18d3d4a63b58a6028169548363921e..3d94f502d4aa7fe3f98c2934ef6a679e03065691 100644 (file)
--- 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,11 @@
                <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