mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Weirdly, JSP 2.2 wants version="2.1"

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2858 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-08-06 21:03:54 +00:00
parent bfae19d97f
commit d91ae80c2b
10 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
zxingorg/web/WEB-INF/web.xml
View file

@ -1,45 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright 2008 ZXing authors Copyright 2008 ZXing authors
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<web-app version="3.0" <web-app version="3.0"
xmlns="http://java.sun.com/xml/ns/javaee" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<display-name>zxing.org</display-name> <display-name>zxing.org</display-name>
<distributable/> <distributable/>
<listener> <listener>
<listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class> <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class>
</listener> </listener>
<servlet> <servlet>
<servlet-name>DecodeServlet</servlet-name> <servlet-name>DecodeServlet</servlet-name>
<servlet-class>com.google.zxing.web.DecodeServlet</servlet-class> <servlet-class>com.google.zxing.web.DecodeServlet</servlet-class>
<load-on-startup>1</load-on-startup> <load-on-startup>1</load-on-startup>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>DecodeServlet</servlet-name> <servlet-name>DecodeServlet</servlet-name>
<url-pattern>/w/decode</url-pattern> <url-pattern>/w/decode</url-pattern>
</servlet-mapping> </servlet-mapping>
<welcome-file-list> <welcome-file-list>
<welcome-file>index.jspx</welcome-file> <welcome-file>index.jspx</welcome-file>
</welcome-file-list> </welcome-file-list>
</web-app> </web-app>

2
zxingorg/web/index.jspx
View file

@ -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" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page contentType="text/html" session="false"/> <jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet> <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
<jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text> <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>

2
zxingorg/web/w/analytics.jspx
View file

@ -14,7 +14,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page session="false"/> <jsp:directive.page session="false"/>
<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.");

2
zxingorg/web/w/badimage.jspx
View file

@ -14,7 +14,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page contentType="text/html" session="false"/> <jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet> <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
<jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text> <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>

2
zxingorg/web/w/badurl.jspx
View file

@ -14,7 +14,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page contentType="text/html" session="false"/> <jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet> <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
<jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text> <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>

2
zxingorg/web/w/decode.jspx
View file

@ -14,7 +14,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page contentType="text/html" session="false"/> <jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet> <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
<jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text> <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>

2
zxingorg/web/w/decoderesult.jspx
View file

@ -14,7 +14,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page import=" <jsp:directive.page import="
java.util.List, java.util.List,
com.google.zxing.Result, com.google.zxing.Result,

2
zxingorg/web/w/format.jspx
View file

@ -14,7 +14,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page contentType="text/html" session="false"/> <jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet> <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
<jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text> <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>

2
zxingorg/web/w/index.jspx
View file

@ -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" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page contentType="text/html" session="false"/> <jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet> <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
<jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text> <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>

2
zxingorg/web/w/notfound.jspx
View file

@ -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" version="2.2"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page contentType="text/html" session="false"/> <jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet> <jsp:scriptlet>response.setHeader("Cache-Control", "public");</jsp:scriptlet>
<jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text> <jsp:text><![CDATA[<!DOCTYPE html>]]></jsp:text>