Make web app work on Servlet/JSP 2.3/1.2 and fix some other mistakes

[zxing.git] / zxingorg / web / WEB-INF / web.xml

diff --git a/zxingorg/web/WEB-INF/web.xml b/zxingorg/web/WEB-INF/web.xml
index 1dc0452..6020767 100644 (file)
--- a/zxingorg/web/WEB-INF/web.xml
+++ b/zxingorg/web/WEB-INF/web.xml
@@ -14,25 +14,12 @@
  See the License for the specific language governing permissions and\r
  limitations under the License.\r
  -->\r
-<web-app version="2.5"\r
-         xmlns="http://java.sun.com/xml/ns/javaee"\r
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">\r
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">\r
+<web-app>\r
 \r
   <display-name>zxing.org</display-name>\r
 \r
-  <welcome-file-list>\r
-    <welcome-file>index.jspx</welcome-file>\r
-  </welcome-file-list>\r
-\r
-  <listener>\r
-    <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class>\r
-  </listener>\r
-  <!--\r
-  <listener>\r
-    <listener-class>com.google.zxing.web.DecodeEmailListener</listener-class>\r
-  </listener>\r
-  -->\r
+  <distributable/>\r
 \r
   <!--\r
   <context-param>\r
@@ -45,6 +32,25 @@
   </context-param>\r
   -->\r
 \r
+  <filter>\r
+    <filter-name>DoSFilter</filter-name>\r
+    <filter-class>com.google.zxing.web.DoSFilter</filter-class>\r
+  </filter>\r
+\r
+  <filter-mapping>\r
+    <filter-name>DoSFilter</filter-name>\r
+    <url-pattern>/*</url-pattern>\r
+  </filter-mapping>\r
+\r
+  <listener>\r
+    <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class>\r
+  </listener>\r
+  <!--\r
+  <listener>\r
+    <listener-class>com.google.zxing.web.DecodeEmailListener</listener-class>\r
+  </listener>\r
+  -->\r
+\r
   <servlet>\r
     <servlet-name>DecodeServlet</servlet-name>\r
     <servlet-class>com.google.zxing.web.DecodeServlet</servlet-class>\r
@@ -55,20 +61,18 @@
     <servlet-name>DecodeServlet</servlet-name>\r
     <url-pattern>/decode</url-pattern>\r
   </servlet-mapping>\r
-\r
-  <filter>\r
-    <filter-name>DoSFilter</filter-name>\r
-    <filter-class>com.google.zxing.web.DoSFilter</filter-class>\r
-  </filter>\r
-\r
-  <filter-mapping>\r
-    <filter-name>DoSFilter</filter-name>\r
-    <url-pattern>/*</url-pattern>\r
-  </filter-mapping>\r
+  <servlet-mapping>\r
+    <servlet-name>jsp</servlet-name>\r
+    <url-pattern>*.jspx</url-pattern>\r
+  </servlet-mapping>\r
 \r
   <mime-mapping>\r
     <extension>cod</extension>\r
     <mime-type>application/vnd.rim.cod</mime-type>\r
   </mime-mapping>\r
 \r
+  <welcome-file-list>\r
+    <welcome-file>index.jspx</welcome-file>\r
+  </welcome-file-list>\r
+\r
 </web-app>\r