server/src/main/webapp/WEB-INF/web.xml
changeset 47 267d67791e05
parent 45 37c9a17c3284
child 48 01fb9167ad75
--- a/server/src/main/webapp/WEB-INF/web.xml	Tue Dec 11 00:01:41 2012 +0100
+++ b/server/src/main/webapp/WEB-INF/web.xml	Tue Dec 25 21:29:11 2012 +0100
@@ -57,10 +57,23 @@
       <param-name>com.sun.jersey.config.property.packages</param-name>
       <param-value>org.iri_research.renkan.rest</param-value>
     </init-param>
+    <init-param>
+      <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
+      <param-value>true</param-value>
+    </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
     <servlet-name>rest Servlet</servlet-name>
     <url-pattern>/rest/*</url-pattern>
   </servlet-mapping>
+  <servlet>
+    <servlet-name>spring</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>spring</servlet-name>
+    <url-pattern>/p/*</url-pattern>
+  </servlet-mapping>
 </web-app>
\ No newline at end of file