From 5bde226ecc5ffb451680062b29309042b579b556 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Fri, 1 Apr 2016 11:56:27 -0500
Subject: [PATCH] Fix Eclipse compile errors

* Most web.xml servlet API versions updated to 3.0 for ASYNC support
* httpsession-xml is left at 2.5 to ensure compatability & remove ASYNC
* Remove @Override on interface override
---
 .../src/main/webapp/WEB-INF/web.xml                           | 4 ++--
 .../src/main/webapp/WEB-INF/web.xml                           | 4 ++--
 samples/httpsession-jdbc-xml/src/main/webapp/WEB-INF/web.xml  | 4 ++--
 .../src/main/java/sample/H2ConsoleInitializer.java            | 1 -
 samples/httpsession-xml/src/main/webapp/WEB-INF/web.xml       | 1 -
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml b/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml
index b7ba5a0b..a6855753 100644
--- a/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml
+++ b/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 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_3_0.xsd">
 	<!--
 	- Location of the XML file that defines the root application context
 	- Applied by ContextLoaderListener.
diff --git a/samples/httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml b/samples/httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml
index 352abb3c..9f311560 100644
--- a/samples/httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml
+++ b/samples/httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 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_3_0.xsd">
 	<!--
 	- Location of the XML file that defines the root application context
 	- Applied by ContextLoaderListener.
diff --git a/samples/httpsession-jdbc-xml/src/main/webapp/WEB-INF/web.xml b/samples/httpsession-jdbc-xml/src/main/webapp/WEB-INF/web.xml
index 9ab0145d..9efdbfc9 100644
--- a/samples/httpsession-jdbc-xml/src/main/webapp/WEB-INF/web.xml
+++ b/samples/httpsession-jdbc-xml/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 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_3_0.xsd">
 	<!--
 	- Location of the XML file that defines the root application context
 	- Applied by ContextLoaderListener.
diff --git a/samples/httpsession-jdbc/src/main/java/sample/H2ConsoleInitializer.java b/samples/httpsession-jdbc/src/main/java/sample/H2ConsoleInitializer.java
index ffdfaf67..278ac560 100644
--- a/samples/httpsession-jdbc/src/main/java/sample/H2ConsoleInitializer.java
+++ b/samples/httpsession-jdbc/src/main/java/sample/H2ConsoleInitializer.java
@@ -24,7 +24,6 @@ import org.springframework.web.WebApplicationInitializer;
 
 public class H2ConsoleInitializer implements WebApplicationInitializer {
 
-	@Override
 	public void onStartup(ServletContext servletContext) throws ServletException {
 		servletContext.addServlet("h2console", new WebServlet()).addMapping("/console/*");
 	}
diff --git a/samples/httpsession-xml/src/main/webapp/WEB-INF/web.xml b/samples/httpsession-xml/src/main/webapp/WEB-INF/web.xml
index 352abb3c..1781ca78 100644
--- a/samples/httpsession-xml/src/main/webapp/WEB-INF/web.xml
+++ b/samples/httpsession-xml/src/main/webapp/WEB-INF/web.xml
@@ -25,7 +25,6 @@
 		<url-pattern>/*</url-pattern>
                 <dispatcher>REQUEST</dispatcher>
                 <dispatcher>ERROR</dispatcher>
-                <dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<!-- end::springSessionRepositoryFilter[] -->