From d91ae80c2ba0276d3c2e5ddadfa396cc8c9a4daa Mon Sep 17 00:00:00 2001
From: "srowen@gmail.com"
 <srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Tue, 6 Aug 2013 21:03:54 +0000
Subject: [PATCH] Weirdly, JSP 2.2 wants version="2.1"

git-svn-id: https://zxing.googlecode.com/svn/trunk@2858 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 zxingorg/web/WEB-INF/web.xml     | 90 ++++++++++++++++----------------
 zxingorg/web/index.jspx          |  2 +-
 zxingorg/web/w/analytics.jspx    |  2 +-
 zxingorg/web/w/badimage.jspx     |  2 +-
 zxingorg/web/w/badurl.jspx       |  2 +-
 zxingorg/web/w/decode.jspx       |  2 +-
 zxingorg/web/w/decoderesult.jspx |  2 +-
 zxingorg/web/w/format.jspx       |  2 +-
 zxingorg/web/w/index.jspx        |  2 +-
 zxingorg/web/w/notfound.jspx     |  2 +-
 10 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/zxingorg/web/WEB-INF/web.xml b/zxingorg/web/WEB-INF/web.xml
index dc7a06226..0906ca75c 100644
--- a/zxingorg/web/WEB-INF/web.xml
+++ b/zxingorg/web/WEB-INF/web.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<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_3_0.xsd">
-
-  <display-name>zxing.org</display-name>
-
-  <distributable/>
-
-  <listener>
-    <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class>
-  </listener>
-
-  <servlet>
-    <servlet-name>DecodeServlet</servlet-name>
-    <servlet-class>com.google.zxing.web.DecodeServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>DecodeServlet</servlet-name>
-    <url-pattern>/w/decode</url-pattern>
-  </servlet-mapping>
-
-  <welcome-file-list>
-    <welcome-file>index.jspx</welcome-file>
-  </welcome-file-list>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<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_3_0.xsd">
+
+  <display-name>zxing.org</display-name>
+
+  <distributable/>
+
+  <listener>
+    <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class>
+  </listener>
+
+  <servlet>
+    <servlet-name>DecodeServlet</servlet-name>
+    <servlet-class>com.google.zxing.web.DecodeServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>DecodeServlet</servlet-name>
+    <url-pattern>/w/decode</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>index.jspx</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/zxingorg/web/index.jspx b/zxingorg/web/index.jspx
index bdc5974ec..134c7c027 100644
--- a/zxingorg/web/index.jspx
+++ b/zxingorg/web/index.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page contentType="text/html" session="false"/>
 <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
 <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>
diff --git a/zxingorg/web/w/analytics.jspx b/zxingorg/web/w/analytics.jspx
index 237969ee6..4ebce92cb 100644
--- a/zxingorg/web/w/analytics.jspx
+++ b/zxingorg/web/w/analytics.jspx
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page session="false"/>
 <script type="text/javascript">
   var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
diff --git a/zxingorg/web/w/badimage.jspx b/zxingorg/web/w/badimage.jspx
index 91ee889c2..65b10a6d0 100644
--- a/zxingorg/web/w/badimage.jspx
+++ b/zxingorg/web/w/badimage.jspx
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page contentType="text/html" session="false"/>
 <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
 <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>
diff --git a/zxingorg/web/w/badurl.jspx b/zxingorg/web/w/badurl.jspx
index f9250ae9f..effa9ba0d 100644
--- a/zxingorg/web/w/badurl.jspx
+++ b/zxingorg/web/w/badurl.jspx
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page contentType="text/html" session="false"/>
 <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
 <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>
diff --git a/zxingorg/web/w/decode.jspx b/zxingorg/web/w/decode.jspx
index 91161c547..fbf0712f0 100644
--- a/zxingorg/web/w/decode.jspx
+++ b/zxingorg/web/w/decode.jspx
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page contentType="text/html" session="false"/>
 <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
 <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>
diff --git a/zxingorg/web/w/decoderesult.jspx b/zxingorg/web/w/decoderesult.jspx
index 95c69af0a..1f0316ea5 100644
--- a/zxingorg/web/w/decoderesult.jspx
+++ b/zxingorg/web/w/decoderesult.jspx
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page import="
   java.util.List,
   com.google.zxing.Result,
diff --git a/zxingorg/web/w/format.jspx b/zxingorg/web/w/format.jspx
index d8296f73f..8dc723c85 100644
--- a/zxingorg/web/w/format.jspx
+++ b/zxingorg/web/w/format.jspx
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page contentType="text/html" session="false"/>
 <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
 <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>
diff --git a/zxingorg/web/w/index.jspx b/zxingorg/web/w/index.jspx
index 47900bbcd..23b11922a 100644
--- a/zxingorg/web/w/index.jspx
+++ b/zxingorg/web/w/index.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page contentType="text/html" session="false"/>
 <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
 <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>
diff --git a/zxingorg/web/w/notfound.jspx b/zxingorg/web/w/notfound.jspx
index d06efc7c6..7f5890635 100644
--- a/zxingorg/web/w/notfound.jspx
+++ b/zxingorg/web/w/notfound.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page contentType="text/html" session="false"/>
 <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
 <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>