From fd416a00a2fe23acd39b0593b0e30592fd8f6b73 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Fri, 26 Jul 2013 12:36:54 +0300
Subject: [PATCH] maven work

---
 spring-mvc-no-xml/pom.xml                        | 16 +++++++++++++---
 .../java/org/baeldung/servlet/WebAppNew.java     |  7 +++++++
 spring-mvc-xml/src/main/webapp/WEB-INF/web.xml   |  8 ++++++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml
index 28ffe63670..248fa398d2 100644
--- a/spring-mvc-no-xml/pom.xml
+++ b/spring-mvc-no-xml/pom.xml
@@ -81,6 +81,15 @@
 
 		<plugins>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>${maven-war-plugin.version}</version>
+				<configuration>
+					<failonmissingwebxml>false</failonmissingwebxml>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -118,9 +127,10 @@
 		<rest-assured.version>1.8.1</rest-assured.version>
 		<groovy.version>1.8.9</groovy.version>
 
-        <!-- Maven plugins -->
-        <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+		<!-- Maven plugins -->
+		<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
+		<maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+		<maven-war-plugin.version>2.4</maven-war-plugin.version>
 	</properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java
index 4779048099..2422f2110a 100644
--- a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java
+++ b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java
@@ -1,5 +1,7 @@
 package org.baeldung.servlet;
 
+import javax.servlet.ServletRegistration.Dynamic;
+
 import org.baeldung.spring.ClientWebConfig;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
@@ -32,4 +34,9 @@ public class WebAppNew extends AbstractAnnotationConfigDispatcherServletInitiali
         return new String[] { "/" };
     }
 
+    @Override
+    protected void customizeRegistration(final Dynamic registration) {
+        super.customizeRegistration(registration);
+    }
+
 }
diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/web.xml b/spring-mvc-xml/src/main/webapp/WEB-INF/web.xml
index 6a81621c4b..055c645e38 100644
--- a/spring-mvc-xml/src/main/webapp/WEB-INF/web.xml
+++ b/spring-mvc-xml/src/main/webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
-	
+
 	<!-- Spring child -->
 	<servlet>
 		<servlet-name>mvc</servlet-name>
@@ -36,7 +36,11 @@
 	</servlet-mapping>
 
 	<!-- additional config -->
-
+	
+	<session-config>
+		<session-timeout>10</session-timeout>
+	</session-config>
+	
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 	</welcome-file-list>