Restructure security

[lgpl/argeo-commons.git] / security / modules / org.argeo.security.webapp / WEB-INF / security-servlet.xml

diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/security-servlet.xml b/security/modules/org.argeo.security.webapp/WEB-INF/security-servlet.xml
index 97d3b121ae9402083bb8a63001a5769fe9ed5067..3201f73e6622b343df582847f49c595da2aa2aca 100644 (file)
--- a/security/modules/org.argeo.security.webapp/WEB-INF/security-servlet.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/security-servlet.xml
@@ -10,24 +10,25 @@
        <context:component-scan base-package="org.argeo.security.mvc" />
 
        <bean id="controller" class="org.argeo.security.mvc.UsersRolesController">
-               <property name="userDao" ref="userDao" />
-               <property name="roleDao" ref="roleDao" />
-               <property name="userDeserializer">
-                       <bean class="org.argeo.server.json.JsonServerMapper">
-                               <property name="targetClass" value="org.argeo.security.BasicArgeoUser" />
-                               <property name="deserializers">
-                                       <map>
-                                               <entry key="org.argeo.security.UserNature">
-                                                       <bean class="org.argeo.server.json.GenericJsonDeserializer">
-                                                               <property name="objectFactories" ref="objectFactories" />
-                                                       </bean>
-                                               </entry>
-                                       </map>
-                               </property>
-                       </bean>
+               <property name="securityService" ref="securityService" />
+               <property name="userDeserializer" ref="userDeserializer">
                </property>
        </bean>
 
+       <bean id="userDeserializer" class="org.argeo.server.json.JsonServerMapper">
+               <property name="targetClass" value="org.argeo.security.BasicArgeoUser" />
+               <property name="deserializers">
+                       <map>
+                               <entry key="org.argeo.security.UserNature">
+                                       <bean class="org.argeo.server.json.GenericJsonDeserializer">
+                                               <property name="objectFactories" ref="objectFactories" />
+                                       </bean>
+                               </entry>
+                       </map>
+               </property>
+       </bean>
+
+
        <bean id="viewResolver" class="org.argeo.server.mvc.SerializingViewResolver">
                <property name="serializer" ref="serverMapper" />
        </bean>