Update zxing.org web app for Amazon Elastic Beanstalk

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

zxingorg/build.xml

@@ -17,7 +17,6 @@
 <project name="zxingorg" basedir="." default="build">
 
   <property file="../build.properties"/>
-  <!--<property file="secrets.properties"/>-->
 
   <target name="init">
     <tstamp/>
@@ -70,27 +69,17 @@
         <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
       </classpath>
     </javac>
-    <!--
+    <mkdir dir="web/w/docs"/>
-    <copy file="web/WEB-INF/web.xml" tofile="web/WEB-INF/web.xml" overwrite="true">
+    <copy todir="web/w/docs">
-      <filterset>
+      <fileset dir="../docs"/>
-        <filter token="EMAIL_PASSWORD" value="${emailPassword}"/>
-      </filterset>
     </copy>
-    -->
     <war warfile="w.war" webxml="web/WEB-INF/web.xml">
       <lib dir="web/WEB-INF/lib">
         <include name="*.jar"/>
       </lib>
       <classes dir="web/WEB-INF/classes"/>
       <fileset dir="web">
-        <include name="*.jspx"/>
+        <exclude name="WEB-INF/**"/>
-        <include name="*.png"/>
-        <include name="*.css"/>        
-        <include name="**/*.jad"/>
-        <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="..">
-        <include name="docs/**"/>
       </fileset>
     </war>
   </target>
@@ -99,6 +88,7 @@
     <delete dir="web/WEB-INF/classes"/>
     <delete file="web/WEB-INF/lib/core.jar"/>
     <delete file="web/WEB-INF/lib/javase.jar"/>
+    <delete dir="web/w/docs"/>
     <delete file="w.war"/>
   </target>
 

zxingorg/restart.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-export CATALINA_OPTS="-server -da -dsa -Xmx80m"
-while :
-do
-        pkill -KILL java
-        #/usr/local/tomcat/bin/shutdown.sh
-        sleep 5
-        /usr/local/tomcat/bin/startup.sh
-        sleep 7200
-done

zxingorg/server.xml

@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <Listener className="org.apache.catalina.core.JasperListener" />
-  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-
-  <Service name="Catalina">
-
-    <Connector port="80" protocol="HTTP/1.1"
-               connectionTimeout="20000" />
-
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <Host name="localhost"  appBase="webapps"
-            unpackWARs="false" autoDeploy="true">
-
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
-               prefix="localhost_access_log." suffix=".txt"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>

zxingorg/web/WEB-INF/web.xml

@@ -21,20 +21,6 @@
 
   <distributable/>
 
-  <filter>
-    <filter-name>DoSFilter</filter-name>
-    <filter-class>com.google.zxing.web.DoSFilter</filter-class>
-    <init-param>
-      <param-name>bad.ips</param-name>
-      <param-value>69.89.31.60,2.95.142.74</param-value> <!-- Causes weird CLOSE_WAIT thread hangs -->
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>DoSFilter</filter-name>
-    <url-pattern>/decode</url-pattern>
-  </filter-mapping>
-
   <listener>
     <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class>
   </listener>
@@ -47,7 +33,7 @@
 
   <servlet-mapping>
     <servlet-name>DecodeServlet</servlet-name>
-    <url-pattern>/decode</url-pattern>
+    <url-pattern>/w/decode</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
     <servlet-name>jsp</servlet-name>

zxingorg/web/index.jspx

@@ -22,7 +22,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   <head>
     <title>Redirect</title>
-    <meta http-equiv="Refresh" content="0;url=decode.jspx"/>
+    <meta http-equiv="Refresh" content="0;url=w/decode.jspx"/>
   </head>
   <body>
   </body>

zxingorg/web/w/index.jspx

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!-- Author: Sean Owen -->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
+<jsp:directive.page contentType="application/xhtml+xml" session="false"/>
+<jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
+<jsp:text><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">]]></jsp:text>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <title>Redirect</title>
+    <meta http-equiv="Refresh" content="0;url=decode.jspx"/>
+  </head>
+  <body>
+  </body>
+</html>
+</jsp:root>