projects / zxing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6de96db)
Small tweaks, use more friendly content type
authorsrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Thu, 28 May 2009 12:05:01 +0000 (12:05 +0000)
committersrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Thu, 28 May 2009 12:05:01 +0000 (12:05 +0000)
git-svn-id: http://zxing.googlecode.com/svn/trunk@959 59b500cc-1b3d-0410-9834-0bbf25fbcc57

zxingorg/src/com/google/zxing/web/DecodeEmailListener.java patch | blob | history
zxingorg/src/com/google/zxing/web/DecodeServlet.java patch | blob | history
zxingorg/web/badimage.jspx patch | blob | history
zxingorg/web/badurl.jspx patch | blob | history
zxingorg/web/decode.jspx patch | blob | history
zxingorg/web/decoderesult.jspx patch | blob | history
zxingorg/web/notfound.jspx patch | blob | history

diff --git a/zxingorg/src/com/google/zxing/web/DecodeEmailListener.java b/zxingorg/src/com/google/zxing/web/DecodeEmailListener.java
index 906fde6..5cade52 100644 (file)
--- a/zxingorg/src/com/google/zxing/web/DecodeEmailListener.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeEmailListener.java
@@ -27,7 +27,7 @@ import java.util.Timer;
  */
 public final class DecodeEmailListener implements ServletContextListener {
 
-  private static final long EMAIL_CHECK_INTERVAL = 3L * 60 * 1000;
+  private static final long EMAIL_CHECK_INTERVAL = 5L * 60 * 1000;
 
   private Timer emailTimer;
 
diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index 7041175..ea5ccc0 100644 (file)
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -85,7 +85,7 @@ public final class DecodeServlet extends HttpServlet {
   static {
     HINTS = new Hashtable<DecodeHintType, Object>(5);
     HINTS.put(DecodeHintType.TRY_HARDER, Boolean.TRUE);
-    Vector possibleFormats = new Vector();
+    Vector<BarcodeFormat> possibleFormats = new Vector<BarcodeFormat>();
     possibleFormats.add(BarcodeFormat.UPC_A);
     possibleFormats.add(BarcodeFormat.UPC_E);
     possibleFormats.add(BarcodeFormat.EAN_8);
diff --git a/zxingorg/web/badimage.jspx b/zxingorg/web/badimage.jspx
index 49ddec6..8acb2e9 100644 (file)
--- a/zxingorg/web/badimage.jspx
+++ b/zxingorg/web/badimage.jspx
@@ -18,9 +18,9 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
-          doctype-public="-//WAPFORUM//DTD XHTML Mobile 1.1//EN"
-          doctype-system="http://www.openmobilealliance.org/tech/DTD/xhtml-mobile11.dtd"/>
-  <jsp:directive.page contentType="application/xhtml+xml" session="false"/>
+          doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+          doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+  <jsp:directive.page contentType="text/html" session="false"/>
   <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
diff --git a/zxingorg/web/badurl.jspx b/zxingorg/web/badurl.jspx
index a171164..d7878d7 100644 (file)
--- a/zxingorg/web/badurl.jspx
+++ b/zxingorg/web/badurl.jspx
@@ -18,9 +18,9 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
-          doctype-public="-//WAPFORUM//DTD XHTML Mobile 1.1//EN"
-          doctype-system="http://www.openmobilealliance.org/tech/DTD/xhtml-mobile11.dtd"/>
-  <jsp:directive.page contentType="application/xhtml+xml" session="false"/>
+          doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+          doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+  <jsp:directive.page contentType="text/html" session="false"/>
   <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
diff --git a/zxingorg/web/decode.jspx b/zxingorg/web/decode.jspx
index df44347..e02d399 100644 (file)
--- a/zxingorg/web/decode.jspx
+++ b/zxingorg/web/decode.jspx
@@ -18,8 +18,8 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
-          doctype-public="-//W3C//DTD XHTML 1.1//EN"
-          doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"/>
+          doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+          doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
   <jsp:directive.page contentType="text/html" session="false"/>
   <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
@@ -28,7 +28,7 @@
     </head>
     <body>
       <h1><img src="zxing-icon.png" height="32" width="32" alt=""/> ZXing Decoder Online</h1>
-      <p><b>Under Construction</b>: This is a simple page that will let you decode a 1D or 2D barcode found
+      <p>This is a simple page that will let you decode a 1D or 2D barcode found
         in an image online. Enter a URL below.
       </p>
       <form action="decode" method="get">
diff --git a/zxingorg/web/decoderesult.jspx b/zxingorg/web/decoderesult.jspx
index 048d350..45e931c 100644 (file)
--- a/zxingorg/web/decoderesult.jspx
+++ b/zxingorg/web/decoderesult.jspx
@@ -18,9 +18,9 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
-          doctype-public="-//WAPFORUM//DTD XHTML Mobile 1.1//EN"
-          doctype-system="http://www.openmobilealliance.org/tech/DTD/xhtml-mobile11.dtd"/>
-  <jsp:directive.page contentType="application/xhtml+xml" session="false"/>
+          doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+          doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+  <jsp:directive.page contentType="text/html" session="false"/>
   <jsp:scriptlet>response.setHeader("Cache-Control", "no-cache");</jsp:scriptlet>
   <jsp:useBean id="result" scope="request" type="com.google.zxing.Result"/>
   <jsp:useBean id="parsedResult" scope="request" type="com.google.zxing.client.result.ParsedResult"/>
diff --git a/zxingorg/web/notfound.jspx b/zxingorg/web/notfound.jspx
index 72729a4..c689d36 100644 (file)
--- a/zxingorg/web/notfound.jspx
+++ b/zxingorg/web/notfound.jspx
@@ -18,9 +18,9 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns="http://www.w3.org/1999/xhtml" version="2.1">
   <jsp:output
           omit-xml-declaration="false" doctype-root-element="html"
-          doctype-public="-//WAPFORUM//DTD XHTML Mobile 1.1//EN"
-          doctype-system="http://www.openmobilealliance.org/tech/DTD/xhtml-mobile11.dtd"/>
-  <jsp:directive.page contentType="application/xhtml+xml" session="false"/>
+          doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+          doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+  <jsp:directive.page contentType="text/html" session="false"/>
   <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
Unnamed repository; edit this file to name it for gitweb.