Updates for appspot

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

diff --git a/zxingorg/build.xml b/zxingorg/build.xml
index c8def96..7aeb4ec 100644 (file)
--- a/zxingorg/build.xml
+++ b/zxingorg/build.xml
@@ -35,6 +35,13 @@
         </not>
       </condition>
     </fail>
+    <fail message="Please build project javadoc first">
+      <condition>
+        <not>
+          <available file="../docs/javadoc" type="dir"/>
+        </not>
+      </condition>
+    </fail>
     <fail message="Please set 'tomcat-home' in build.properties">
       <condition>
         <not>
@@ -72,10 +79,16 @@
         <include name="*.jar"/>
       </lib>
       <classes dir="web/WEB-INF/classes"/>
+      <webinf dir="web/WEB-INF">
+        <include name="appengine-web.xml"/>
+      </webinf>
       <fileset dir="web">
         <include name="*.jspx"/>
         <include name="*.png"/>
       </fileset>
+      <fileset dir="..">
+        <include name="docs/**"/>
+      </fileset>
     </war>
   </target>
 

diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index c091729..a6713cd 100644 (file)
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -35,7 +35,6 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.http.Header;
-import org.apache.http.HttpException;
 import org.apache.http.HttpMessage;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;

diff --git a/zxingorg/web/WEB-INF/appengine-web.xml b/zxingorg/web/WEB-INF/appengine-web.xml
new file mode 100644 (file)
index 0000000..5e5bf25
--- /dev/null
+++ b/zxingorg/web/WEB-INF/appengine-web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>zxing</application>
+  <version>1</version>
+</appengine-web-app>

diff --git a/zxingorg/web/analytics.jspx b/zxingorg/web/analytics.jspx
index eb34636..ee69620 100644 (file)
--- a/zxingorg/web/analytics.jspx
+++ b/zxingorg/web/analytics.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
   <jsp:output omit-xml-declaration="true"/>
   <script type="text/javascript">
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

diff --git a/zxingorg/web/badimage.jspx b/zxingorg/web/badimage.jspx
index 8acb2e9..a0568bd 100644 (file)
--- a/zxingorg/web/badimage.jspx
+++ b/zxingorg/web/badimage.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
           doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"

diff --git a/zxingorg/web/badurl.jspx b/zxingorg/web/badurl.jspx
index d7878d7..d0f5916 100644 (file)
--- a/zxingorg/web/badurl.jspx
+++ b/zxingorg/web/badurl.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
           doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"

diff --git a/zxingorg/web/decode.jspx b/zxingorg/web/decode.jspx
index e02d399..2067d28 100644 (file)
--- a/zxingorg/web/decode.jspx
+++ b/zxingorg/web/decode.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
           doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"

diff --git a/zxingorg/web/decoderesult.jspx b/zxingorg/web/decoderesult.jspx
index 45e931c..2f525af 100644 (file)
--- a/zxingorg/web/decoderesult.jspx
+++ b/zxingorg/web/decoderesult.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
           doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"

diff --git a/zxingorg/web/index.jspx b/zxingorg/web/index.jspx
index 852f4ce..1519748 100644 (file)
--- 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" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
           doctype-public="-//WAPFORUM//DTD XHTML Mobile 1.1//EN"

diff --git a/zxingorg/web/notfound.jspx b/zxingorg/web/notfound.jspx
index c689d36..43e356d 100644 (file)
--- a/zxingorg/web/notfound.jspx
+++ b/zxingorg/web/notfound.jspx
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <!-- Author: Sean Owen -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
           doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"