X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.os%2FMETA-INF%2Fspring%2Fsecurity-os.xml;h=33b4be32fe18d3d4a63b58a6028169548363921e;hb=0264343ac62fe9d2f7a900d8d6e6ac0ba07bb59b;hp=180f1fe8d042af2a7e3665b94dd9043838bebf17;hpb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;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 180f1fe8d..33b4be32f 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,31 +11,60 @@
 		</property>
 	</bean>
 
-	<bean id="osJcrAuthenticationProvider" class="org.argeo.security.jcr.OsJcrAuthenticationProvider">
+	<bean id="argeoDataModel" class="org.argeo.jackrabbit.JackrabbitContainer"
+		init-method="init" destroy-method="destroy">
+		<description><![CDATA[Make sure that Argeo base data model is registered]]></description>
+		<property name="cndFiles">
+			<list>
+				<value>/org/argeo/jcr/argeo.cnd</value>
+			</list>
+		</property>
+		<property name="repository" ref="nodeRepository" />
+		<property name="bundleContext" ref="bundleContext" />
 	</bean>
 
-
 	<bean id="systemExecutionService" class="org.argeo.security.core.KeyBasedSystemExecutionService">
-		<property name="systemAuthenticationKey" value="${argeo.security.systemKey}" />
 		<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">
-			<bean factory-bean="authenticationProvidersRegister"
-				factory-method="getProviders" />
+			<list>
+				<ref bean="authByAdapterProvider" />
+				<ref bean="osJcrAuthenticationProvider" />
+			</list>
 		</property>
 	</bean>
 
-	<bean id="authenticationProvidersRegister" class="org.argeo.security.core.AuthenticationProvidersRegister">
-		<property name="defaultProviders">
+	<!-- Authentication providers -->
+	<bean id="osJcrAuthenticationProvider" class="org.argeo.security.jcr.OsJcrAuthenticationProvider"
+		init-method="init" destroy-method="destroy" depends-on="argeoDataModel">
+		<property name="repository" ref="nodeRepository" />
+	</bean>
+
+	<bean id="authByAdapterProvider"
+		class="org.springframework.security.adapters.AuthByAdapterProvider">
+		<description><![CDATA[System authentication]]></description>
+		<property name="key" value="${argeo.security.systemKey}" />
+	</bean>
+
+	<!-- Internal authentication, used by the general authentication process 
+		himself, in order to prevent the following dependency cycle: Repository.login() 
+		<= AuthenticationManager <= osJcrAuthenticationProvider <= Repository.login() 
+		in init() -->
+	<bean id="internalAuthenticationManager" class="org.springframework.security.providers.ProviderManager">
+		<property name="providers">
 			<list>
-				<bean class="org.springframework.security.adapters.AuthByAdapterProvider">
-					<property name="key" value="${argeo.security.systemKey}" />
-				</bean>
-				<ref bean="osJcrAuthenticationProvider" />
+				<ref bean="authByAdapterProvider" />
 			</list>
 		</property>
 	</bean>
 
+	<bean
+		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
+		<description><![CDATA[Executes initialization with a system authentication]]></description>
+		<property name="authenticationManager" ref="internalAuthenticationManager" />
+	</bean>
+
 </beans>
\ No newline at end of file