Make Servlet 2.5 compatible

Fixes gh-111 gh-182

samples/httpsession-xml/src/main/java/sample/SessionServlet.java

@@ -16,12 +16,10 @@
 package sample;
 
 import javax.servlet.*;
-import javax.servlet.annotation.*;
 import javax.servlet.http.*;
 import java.io.IOException;
 
 // tag::class[]
-@WebServlet("/session")
 public class SessionServlet extends HttpServlet {
 
 	@Override

samples/httpsession-xml/src/main/webapp/WEB-INF/web.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5" 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">
+		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">
 	<!--
-	  - Location of the XML file that defines the root application context
-	  - Applied by ContextLoaderListener.
-	  -->
+	- Location of the XML file that defines the root application context
+	- Applied by ContextLoaderListener.
+	-->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
@@ -24,14 +24,24 @@
 	</filter-mapping>
 
 	<!--
-	  - Loads the root application context of this web app at startup.
-	  - The application context is then available via
-	  - WebApplicationContextUtils.getWebApplicationContext(servletContext).
+	- Loads the root application context of this web app at startup.
+	- The application context is then available via
+	- WebApplicationContextUtils.getWebApplicationContext(servletContext).
 	-->
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
+	<servlet>
+		<servlet-name>session</servlet-name>
+		<servlet-class>sample.SessionServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>session</servlet-name>
+		<url-pattern>/session</url-pattern>
+	</servlet-mapping>
+
 	<welcome-file-list>
 		<welcome-file>index.jsp</welcome-file>
 	</welcome-file-list>