check-osgi working

git-svn-id: https://svn.argeo.org/commons/branches/mbaudier.2.tp@7640 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
index 9a2f2d1d42744eebe137d87ac350efc35b512db7..886f333f6093ee5ad3fae0a3934b0fdeee6c3cb9 100644 (file)
--- a/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
+++ b/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
@@ -4,7 +4,8 @@
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-       <bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
+       <bean id="authenticationManager"
+               class="org.springframework.security.authentication.ProviderManager">
                <property name="providers">
                        <list>
                                <ref bean="authByAdapterProvider" />
@@ -17,8 +18,7 @@
        </bean>
 
        <!-- Authentication provider -->
-       <bean id="authByAdapterProvider"
-               class="org.springframework.security.adapters.AuthByAdapterProvider">
+       <bean id="authByAdapterProvider" class="org.argeo.security.core.InternalAuthenticationProvider">
                <description><![CDATA[System authentication]]></description>
                <property name="key" value="${argeo.security.systemKey}" />
        </bean>
@@ -50,7 +50,8 @@
                initialization himself, in order to prevent the following dependency cycle: 
                Repository.login() <= AuthenticationManager <= LdapAuthenticationProvider 
                <= Repository.login() in init() -->
-       <bean id="internalAuthenticationManager" class="org.springframework.security.authentication.ProviderManager">
+       <bean id="internalAuthenticationManager"
+               class="org.springframework.security.authentication.ProviderManager">
                <property name="providers">
                        <list>
                                <ref bean="authByAdapterProvider" />

diff --git a/org.argeo.security.dao.os/META-INF/spring/security-os.xml b/org.argeo.security.dao.os/META-INF/spring/security-os.xml
index d80084dfe3c60bba2ffc6f07708372720d8cffbf..69880f7506b76d11d5d2260a51b0cf1e4fecf6aa 100644 (file)
--- a/org.argeo.security.dao.os/META-INF/spring/security-os.xml
+++ b/org.argeo.security.dao.os/META-INF/spring/security-os.xml
@@ -23,7 +23,8 @@
                <property name="bundleContext" ref="bundleContext" />
        </bean>
 
-       <bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
+       <bean id="authenticationManager"
+               class="org.springframework.security.authentication.ProviderManager">
                <property name="providers">
                        <list>
                                <ref bean="authByAdapterProvider" />
@@ -41,8 +42,7 @@
 
        <bean name="jcrSecurityModel" class="org.argeo.security.jackrabbit.JackrabbitSecurityModel" />
 
-       <bean id="authByAdapterProvider"
-               class="org.springframework.security.adapters.AuthByAdapterProvider">
+       <bean id="authByAdapterProvider" class="org.argeo.security.core.InternalAuthenticationProvider">
                <description><![CDATA[System authentication]]></description>
                <property name="key" value="${argeo.security.systemKey}" />
        </bean>
@@ -51,7 +51,8 @@
                himself, in order to prevent the following dependency cycle: Repository.login() 
                <= AuthenticationManager <= osJcrAuthenticationProvider <= Repository.login() 
                in init() -->
-       <bean id="internalAuthenticationManager" class="org.springframework.security.authentication.ProviderManager">
+       <bean id="internalAuthenticationManager"
+               class="org.springframework.security.authentication.ProviderManager">
                <property name="providers">
                        <list>
                                <ref bean="authByAdapterProvider" />