From e8af8a68cec2d0c177929b9e7d30d0edf223a6ed Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Tue, 4 Aug 2009 08:54:02 +0000
Subject: [PATCH] Disable email-based decoding -- won't be able to support it
 soon and it is very rarely used by anyone. Leaving code in for future
 reference though.

git-svn-id: http://zxing.googlecode.com/svn/trunk@1030 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 zxingorg/build.xml                                 | 5 +++--
 zxingorg/web/WEB-INF/{web.xml.template => web.xml} | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename zxingorg/web/WEB-INF/{web.xml.template => web.xml} (95%)

diff --git a/zxingorg/build.xml b/zxingorg/build.xml
index 7aeb4ec7..c23a1bc5 100644
--- 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.template b/zxingorg/web/WEB-INF/web.xml
similarity index 95%
rename from zxingorg/web/WEB-INF/web.xml.template
rename to zxingorg/web/WEB-INF/web.xml
index 1e8f4a2a..1dc0452d 100644
--- a/zxingorg/web/WEB-INF/web.xml.template
+++ b/zxingorg/web/WEB-INF/web.xml
@@ -28,10 +28,13 @@
   <listener>
     <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class>
   </listener>
+  <!--
   <listener>
     <listener-class>com.google.zxing.web.DecodeEmailListener</listener-class>
   </listener>
+  -->
 
+  <!--
   <context-param>
     <param-name>emailAddress</param-name>
     <param-value>w@zxing.org</param-value>
@@ -40,6 +43,7 @@
     <param-name>emailPassword</param-name>
     <param-value>@EMAIL_PASSWORD@</param-value>
   </context-param>
+  -->
 
   <servlet>
     <servlet-name>DecodeServlet</servlet-name>
-- 
2.20.1