summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-01-14 12:24:43 +0200
committerArtur Signell <artur@vaadin.com>2013-01-14 12:25:05 +0200
commite582fc52d30792140658ada42c14e52ef1a65233 (patch)
treebc98b5ed9a2d0fe16170d3575c1f4886f1286807 /WebContent/WEB-INF
parentcc9cc89865d7378a06497fa4ec08c30311b9f83a (diff)
downloadvaadin-framework-e582fc52d30792140658ada42c14e52ef1a65233.tar.gz
vaadin-framework-e582fc52d30792140658ada42c14e52ef1a65233.zip
Updated to servlet 2.4 (#10723)
Change-Id: Ib3ec0bd74ce88216b4f94c188f57581e0c715c86
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r--WebContent/WEB-INF/web.xml12
1 files changed, 5 insertions, 7 deletions
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>