From: Artur Signell <artur@vaadin.com>
Date: Mon, 14 Jan 2013 10:24:43 +0000 (+0200)
Subject: Updated to servlet 2.4 (#10723)
X-Git-Tag: 7.0.0.rc1~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e582fc52d30792140658ada42c14e52ef1a65233;p=vaadin-framework.git

Updated to servlet 2.4 (#10723)

Change-Id: Ib3ec0bd74ce88216b4f94c188f57581e0c715c86
---

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index cd1f0a75cc..d0ad8aa2ec 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="vaadin-uitest" version="2.4"
+	xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	<!-- THIS IS A DEVELOPMENT AND TESTING web.xml . -->
 
-<!-- THIS IS A DEVELOPMENT AND TESTING web.xml . -->
-
-<web-app>
 	<display-name>Vaadin</display-name>
 	<description>Vaadin examples</description>