mirror of
https://github.com/zxing/zxing.git
synced 2025-03-05 20:48:51 -08:00
Updates for appspot
git-svn-id: https://zxing.googlecode.com/svn/trunk@995 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
dd067b4ba2
commit
a4b2678420
|
@ -35,6 +35,13 @@
|
||||||
</not>
|
</not>
|
||||||
</condition>
|
</condition>
|
||||||
</fail>
|
</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">
|
<fail message="Please set 'tomcat-home' in build.properties">
|
||||||
<condition>
|
<condition>
|
||||||
<not>
|
<not>
|
||||||
|
@ -72,10 +79,16 @@
|
||||||
<include name="*.jar"/>
|
<include name="*.jar"/>
|
||||||
</lib>
|
</lib>
|
||||||
<classes dir="web/WEB-INF/classes"/>
|
<classes dir="web/WEB-INF/classes"/>
|
||||||
|
<webinf dir="web/WEB-INF">
|
||||||
|
<include name="appengine-web.xml"/>
|
||||||
|
</webinf>
|
||||||
<fileset dir="web">
|
<fileset dir="web">
|
||||||
<include name="*.jspx"/>
|
<include name="*.jspx"/>
|
||||||
<include name="*.png"/>
|
<include name="*.png"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
|
<fileset dir="..">
|
||||||
|
<include name="docs/**"/>
|
||||||
|
</fileset>
|
||||||
</war>
|
</war>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
|
||||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||||
import org.apache.commons.lang.StringEscapeUtils;
|
import org.apache.commons.lang.StringEscapeUtils;
|
||||||
import org.apache.http.Header;
|
import org.apache.http.Header;
|
||||||
import org.apache.http.HttpException;
|
|
||||||
import org.apache.http.HttpMessage;
|
import org.apache.http.HttpMessage;
|
||||||
import org.apache.http.HttpResponse;
|
import org.apache.http.HttpResponse;
|
||||||
import org.apache.http.HttpVersion;
|
import org.apache.http.HttpVersion;
|
||||||
|
|
5
zxingorg/web/WEB-INF/appengine-web.xml
Normal file
5
zxingorg/web/WEB-INF/appengine-web.xml
Normal file
|
@ -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>
|
|
@ -15,7 +15,7 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<!-- Author: Sean Owen -->
|
<!-- 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"/>
|
<jsp:output omit-xml-declaration="true"/>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
|
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<!-- Author: Sean Owen -->
|
<!-- 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
|
<jsp:output
|
||||||
omit-xml-declaration="false" doctype-root-element="html"
|
omit-xml-declaration="false" doctype-root-element="html"
|
||||||
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<!-- Author: Sean Owen -->
|
<!-- 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
|
<jsp:output
|
||||||
omit-xml-declaration="false" doctype-root-element="html"
|
omit-xml-declaration="false" doctype-root-element="html"
|
||||||
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<!-- Author: Sean Owen -->
|
<!-- 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
|
<jsp:output
|
||||||
omit-xml-declaration="false" doctype-root-element="html"
|
omit-xml-declaration="false" doctype-root-element="html"
|
||||||
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<!-- Author: Sean Owen -->
|
<!-- 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
|
<jsp:output
|
||||||
omit-xml-declaration="false" doctype-root-element="html"
|
omit-xml-declaration="false" doctype-root-element="html"
|
||||||
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<!-- Author: Sean Owen -->
|
<!-- 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
|
<jsp:output
|
||||||
omit-xml-declaration="false" doctype-root-element="html"
|
omit-xml-declaration="false" doctype-root-element="html"
|
||||||
doctype-public="-//WAPFORUM//DTD XHTML Mobile 1.1//EN"
|
doctype-public="-//WAPFORUM//DTD XHTML Mobile 1.1//EN"
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<!-- Author: Sean Owen -->
|
<!-- 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
|
<jsp:output
|
||||||
omit-xml-declaration="false" doctype-root-element="html"
|
omit-xml-declaration="false" doctype-root-element="html"
|
||||||
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||||
|
|
Loading…
Reference in a new issue