Disable email-based decoding -- won't be able to support it soon and it is very rarel...

git-svn-id: http://zxing.googlecode.com/svn/trunk@1030 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/zxingorg/build.xml b/zxingorg/build.xml
index 7aeb4ec..c23a1bc 100644 (file)
--- a/zxingorg/build.xml
+++ b/zxingorg/build.xml
@@ -69,11 +69,13 @@
         <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
       </classpath>
     </javac>
-    <copy file="web/WEB-INF/web.xml.template" tofile="web/WEB-INF/web.xml" overwrite="true">
+    <!--
+    <copy file="web/WEB-INF/web.xml" tofile="web/WEB-INF/web.xml" overwrite="true">
       <filterset>
         <filter token="EMAIL_PASSWORD" value="${emailPassword}"/>
       </filterset>
     </copy>
+    -->
     <war warfile="zxingorg.war" webxml="web/WEB-INF/web.xml">
       <lib dir="web/WEB-INF/lib">
         <include name="*.jar"/>
@@ -93,7 +95,6 @@
   </target>
 
   <target name="clean">
-    <delete dir="web/WEB-INF/web.xml"/>
     <delete dir="web/WEB-INF/classes"/>
     <delete file="web/WEB-INF/lib/core.jar"/>
     <delete file="web/WEB-INF/lib/javase.jar"/>

diff --git a/zxingorg/web/WEB-INF/web.xml b/zxingorg/web/WEB-INF/web.xml
new file mode 100644 (file)
index 0000000..1dc0452
--- /dev/null
+++ b/zxingorg/web/WEB-INF/web.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+ Copyright 2008 ZXing authors\r
+\r
+ Licensed under the Apache License, Version 2.0 (the "License");\r
+ you may not use this file except in compliance with the License.\r
+ You may obtain a copy of the License at\r
+\r
+      http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an "AS IS" BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ 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
+\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
+\r
+  <!--\r
+  <context-param>\r
+    <param-name>emailAddress</param-name>\r
+    <param-value>w@zxing.org</param-value>\r
+  </context-param>\r
+  <context-param>\r
+    <param-name>emailPassword</param-name>\r
+    <param-value>@EMAIL_PASSWORD@</param-value>\r
+  </context-param>\r
+  -->\r
+\r
+  <servlet>\r
+    <servlet-name>DecodeServlet</servlet-name>\r
+    <servlet-class>com.google.zxing.web.DecodeServlet</servlet-class>\r
+    <load-on-startup>1</load-on-startup>\r
+  </servlet>\r
+\r
+  <servlet-mapping>\r
+    <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
+\r
+  <mime-mapping>\r
+    <extension>cod</extension>\r
+    <mime-type>application/vnd.rim.cod</mime-type>\r
+  </mime-mapping>\r
+\r
+</web-app>\r

diff --git a/zxingorg/web/WEB-INF/web.xml.template b/zxingorg/web/WEB-INF/web.xml.template
deleted file mode 100644 (file)
index 1e8f4a2..0000000
--- a/zxingorg/web/WEB-INF/web.xml.template
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
- Copyright 2008 ZXing authors\r
-\r
- Licensed under the Apache License, Version 2.0 (the "License");\r
- you may not use this file except in compliance with the License.\r
- You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
- Unless required by applicable law or agreed to in writing, software\r
- distributed under the License is distributed on an "AS IS" BASIS,\r
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- 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
-\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
-  <listener>\r
-    <listener-class>com.google.zxing.web.DecodeEmailListener</listener-class>\r
-  </listener>\r
-\r
-  <context-param>\r
-    <param-name>emailAddress</param-name>\r
-    <param-value>w@zxing.org</param-value>\r
-  </context-param>\r
-  <context-param>\r
-    <param-name>emailPassword</param-name>\r
-    <param-value>@EMAIL_PASSWORD@</param-value>\r
-  </context-param>\r
-\r
-  <servlet>\r
-    <servlet-name>DecodeServlet</servlet-name>\r
-    <servlet-class>com.google.zxing.web.DecodeServlet</servlet-class>\r
-    <load-on-startup>1</load-on-startup>\r
-  </servlet>\r
-\r
-  <servlet-mapping>\r
-    <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
-\r
-  <mime-mapping>\r
-    <extension>cod</extension>\r
-    <mime-type>application/vnd.rim.cod</mime-type>\r
-  </mime-mapping>\r
-\r
-</web-app>\r