Updated header of web.xml files to use XSD version 2.5 Review at http://gwt-code-reviews.appspot.com/1529804 Review by: rdayal@google.com git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10567 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/mobilewebapp/src/main/webapp/WEB-INF/web.xml b/samples/mobilewebapp/src/main/webapp/WEB-INF/web.xml index a8d039f..7490828 100644 --- a/samples/mobilewebapp/src/main/webapp/WEB-INF/web.xml +++ b/samples/mobilewebapp/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> - -<web-app> +<web-app 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" + version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee"> <!-- Require login. We only require login for the MobileWebApp.html page (instead of *.html) because @@ -36,10 +36,10 @@ <filter> <filter-name>GaeAuthFilter</filter-name> - <description> + <!-- This filter demonstrates making GAE authentication services visible to a RequestFactory client. - </description> + --> <filter-class>com.google.gwt.sample.gaerequest.server.GaeAuthFilter</filter-class> </filter> <filter-mapping>
diff --git a/user/src/com/google/gwt/user/tools/templates/sample/_warFolder_/WEB-INF/web.xmlsrc b/user/src/com/google/gwt/user/tools/templates/sample/_warFolder_/WEB-INF/web.xmlsrc index fa54208..d35c414 100644 --- a/user/src/com/google/gwt/user/tools/templates/sample/_warFolder_/WEB-INF/web.xmlsrc +++ b/user/src/com/google/gwt/user/tools/templates/sample/_warFolder_/WEB-INF/web.xmlsrc
@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app 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" + version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee"> -<web-app> - <!-- Servlets --> <servlet> <servlet-name>greetServlet</servlet-name>