Mercurial Mercurial > renkan / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to servlet 3.0 user_management
authorymh <ymh.work@gmail.com>
Wed, 16 Oct 2013 23:26:28 +0200
branchuser_management
changeset 221 a392390de1a7
parent 220 ecbb104cf3b6
child 222 6ac00231ee34
upgrade to servlet 3.0
server/pom.xml file | annotate | diff | comparison | revisions
server/src/main/webapp/WEB-INF/web.xml file | annotate | diff | comparison | revisions 
--- a/server/pom.xml	Wed Oct 16 17:32:51 2013 +0200
+++ b/server/pom.xml	Wed Oct 16 23:26:28 2013 +0200
@@ -29,7 +29,7 @@
         <jaxrs-api-version>2.0</jaxrs-api-version>
         <javax-annotation-version>1.2</javax-annotation-version>
         <javax-inject-version>1</javax-inject-version>
-        <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
+        <javax-servlet-api-version>3.0.1</javax-servlet-api-version>
         <javax-servlet-jstl-version>1.2</javax-servlet-jstl-version>
         <javax-persistence-api-version>1.0.2</javax-persistence-api-version>
         <javax-validation-api-version>1.1.0.CR2</javax-validation-api-version>
--- a/server/src/main/webapp/WEB-INF/web.xml	Wed Oct 16 17:32:51 2013 +0200
+++ b/server/src/main/webapp/WEB-INF/web.xml	Wed Oct 16 23:26:28 2013 +0200
@@ -2,15 +2,15 @@
 <web-app 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    version="2.5">
+    xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    version="3.0">
   <listener>  
       <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>  
   </listener>
   <listener>  
       <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>  
-  </listener>  
+  </listener>
   <context-param>  
     <param-name>contextConfigLocation</param-name>  
     <param-value>/WEB-INF/applicationContext.xml</param-value>  
@@ -72,10 +72,6 @@
       <param-name>javax.ws.rs.Application</param-name>
       <param-value>org.iri_research.renkan.rest.RestApplication</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>
renkan