Move security admin services

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

diff --git a/security/modules/org.argeo.security.services/META-INF/spring/services.xml b/security/modules/org.argeo.security.services/META-INF/spring/services.xml
index c602a6bc53f53dd7d96bb02a74a83f815ea72aca..e04e2f197e6e192bb975abf4f6c4c98b1f5e4d54 100644 (file)
--- a/security/modules/org.argeo.security.services/META-INF/spring/services.xml
+++ b/security/modules/org.argeo.security.services/META-INF/spring/services.xml
@@ -8,16 +8,12 @@
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
                <property name="locations">
-                       <value>osgibundle:security.properties
-                       </value>
+                       <value>osgibundle:security.properties</value>
                </property>
        </bean>
 
-       <bean id="securityService" class="org.argeo.security.core.DefaultSecurityService">
-               <property name="securityDao" ref="securityDao" />
-               <property name="passwordEncoder" ref="passwordEncoder" />
-               <property name="authenticationManager" ref="authenticationManager" />
-               <property name="systemAuthenticationKey" value="${argeo.security.systemKey}" />
+       <bean id="securityService" class="org.argeo.security.core.DefaultCurrentUserService">
+               <property name="currentUserDao" ref="currentUserDao" />
        </bean>
 
        <bean id="systemExecutionService" class="org.argeo.security.core.KeyBasedSystemExecutionService">
@@ -38,11 +34,4 @@
                        </list>
                </property>
        </bean>
-
-
-       <!-- <bean id="rememberMeAuthenticationProvider" -->
-       <!-- class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider"> -->
-       <!-- <property name="key" value="${argeo.security.systemKey}" /> -->
-       <!-- </bean> -->
-
 </beans>
\ No newline at end of file