X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fmodules%2Forg.argeo.security.webapp%2FWEB-INF%2Fsecurity-servlet.xml;h=bab0a82e4dabef90541dcc36c1615856456ed5ad;hb=51cdd7c0883f0ccd756f0f5d0dc2ac97b327d25d;hp=97d3b121ae9402083bb8a63001a5769fe9ed5067;hpb=00ae7654c948e62c35ef88e7d8d528965d5e0371;p=lgpl%2Fargeo-commons.git

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 97d3b121a..bab0a82e4 100644
--- 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.SimpleArgeoUser" />
+		<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>