From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 15 Feb 2010 10:41:11 +0000 (+0000)
Subject: Use serializer view from argeo commons
X-Git-Tag: argeo-slc-2.1.7~1432
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=893e3ef317a2e9dccad3e32e21bf72bf3fc3e0bb;p=gpl%2Fargeo-slc.git

Use serializer view from argeo commons

git-svn-id: https://svn.argeo.org/slc/trunk@3349 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index f38b8e764..77a0cc701 100644
--- a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -8,6 +8,8 @@ Import-Package: net.sf.cglib.core,
  net.sf.cglib.proxy,
  net.sf.cglib.reflect,
  org.aopalliance.aop,
+ org.argeo.server,
+ org.argeo.server.mvc,
  org.argeo.slc.build,
  org.argeo.slc.core.attachment,
  org.argeo.slc.core.test.tree,
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slcservice-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slcservice-servlet.xml
index 084984bdd..7b9ea8e86 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slcservice-servlet.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slcservice-servlet.xml
@@ -66,7 +66,11 @@
 		</property>
 	</bean>
 
-	<bean id="viewResolver" class="org.argeo.slc.web.mvc.MarshallerViewResolver">
-		<constructor-arg ref="marshaller" />
+	<bean id="viewResolver" class="org.argeo.server.mvc.SerializingViewResolver">
+		<property name="serializer">
+			<bean class="org.argeo.server.MarshallerServerSerializer">
+				<property name="marshaller" ref="marshaller" />
+			</bean>
+		</property>
 	</bean>
 </beans>
\ No newline at end of file