Move GIS to commons

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.webapp.war / WEB-INF / jcr-servlet.xml

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml
index b3c51bc5287294bd9263efa55ca70ed40b8589bd..61c886765e1dc6b7543c00fb78df59b59d6b121e 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/jcr-servlet.xml
@@ -7,11 +7,31 @@
                http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
                http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-       <context:component-scan base-package="org.argeo.server.jcr.mvc" />
+       <context:component-scan base-package="org.argeo.jcr.mvc" />
 
-       <bean name="/*.jcr" class="org.argeo.server.jcr.mvc.JcrBrowserController">
+       <bean name="/*.jcr" class="org.argeo.jcr.mvc.JcrBrowserController" />
+
+       <!-- Views -->
+       <bean name="getJcrItem" class="org.argeo.server.mvc.SerializingView">
+               <property name="serializer">
+                       <bean class="org.argeo.jcr.mvc.JcrXmlServerSerializer" />
+               </property>
+       </bean>
+
+       <bean name="queryJcrNodes" class="org.argeo.server.mvc.SerializingView">
+               <property name="serializer" ref="jsonSerializer" />
+       </bean>
+
+       <bean name="queryJcrTable" class="org.argeo.server.mvc.SerializingView">
+               <property name="serializer" ref="jsonSerializer" />
        </bean>
 
+       <bean name="500" class="org.argeo.server.mvc.SerializingView">
+               <property name="serializer" ref="jsonSerializer" />
+       </bean>
+
+       <!-- Serializers -->
+       <bean id="jsonSerializer" class="org.argeo.server.json.JsonServerSerializer" />
 
        <!-- MVC -->
        <bean id="handlerMapping"
@@ -23,9 +43,9 @@
                </property>
        </bean>
 
-       <bean id="viewResolver" class="org.argeo.server.mvc.SerializingViewResolver">
-               <property name="serializer">
-                       <bean class="org.argeo.server.jcr.mvc.JcrXmlServerSerializer" />
-               </property>
-       </bean>
+       <bean id="viewResolver"
+               class="org.springframework.web.servlet.view.BeanNameViewResolver" />
+
+       <bean class="org.argeo.server.mvc.DefaultHandlerExceptionResolver" />
+
 </beans>
\ No newline at end of file