From 394eabd31652c6745e3c0790385cfd0e2636b83e Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 11 Jan 2011 15:29:28 +0000 Subject: [PATCH] License should be first thing in file unless file format prohibits it git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1057694 13f79535-47bb-0310-9956-ffa450edef68 --- test/webapp-3.0/bug42565.jsp | 2 +- test/webapp-3.0/bug44994.jsp | 2 +- test/webapp-3.0/bug45nnn/bug45015a.jsp | 2 +- test/webapp-3.0/bug45nnn/bug45015b.jsp | 2 +- test/webapp-3.0/bug45nnn/bug45015c.jsp | 2 +- test/webapp-3.0/bug45nnn/bug45427.jsp | 2 +- test/webapp-3.0/bug45nnn/bug45451a.jsp | 2 +- test/webapp-3.0/bug45nnn/bug45511.jsp | 2 +- test/webapp-3.0/bug46381.jsp | 2 +- test/webapp-3.0/bug46596.jsp | 4 ++-- test/webapp-3.0/bug47331.jsp | 2 +- test/webapp-3.0/bug47413.jsp | 2 +- test/webapp-3.0/bug48nnn/bug48112.jsp | 4 ++-- test/webapp-3.0/bug48nnn/bug48627.jsp | 2 +- test/webapp-3.0/el-method.jsp | 6 +++--- test/webapp-3.0/el-misc.jsp | 2 +- test/webapp-3.0/script-expr.jsp | 2 +- webapps/ROOT/index.jsp | 2 +- webapps/examples/jsp/cal/cal1.jsp | 2 +- webapps/examples/jsp/cal/cal2.jsp | 3 +-- webapps/examples/jsp/chat/index.jsp | 16 ++++++++-------- webapps/examples/jsp/chat/login.jsp | 6 +++--- webapps/examples/jsp/chat/post.jsp | 6 +++--- webapps/examples/jsp/checkbox/checkresult.jsp | 3 +-- webapps/examples/jsp/colors/colrs.jsp | 2 +- webapps/examples/jsp/dates/date.jsp | 2 +- webapps/examples/jsp/error/err.jsp | 2 +- webapps/examples/jsp/error/errorpge.jsp | 2 +- webapps/examples/jsp/forward/forward.jsp | 3 +-- webapps/examples/jsp/forward/one.jsp | 2 +- webapps/examples/jsp/include/include.jsp | 2 +- webapps/examples/jsp/jsptoserv/hello.jsp | 2 +- webapps/examples/jsp/jsptoserv/jsptoservlet.jsp | 2 +- webapps/examples/jsp/plugin/plugin.jsp | 2 +- webapps/examples/jsp/sessions/carts.jsp | 3 +-- webapps/examples/jsp/simpletag/foo.jsp | 2 +- webapps/examples/jsp/snp/snoop.jsp | 3 +-- 37 files changed, 52 insertions(+), 57 deletions(-) diff --git a/test/webapp-3.0/bug42565.jsp b/test/webapp-3.0/bug42565.jsp index 8aeb5392e..fbec1a1d7 100644 --- a/test/webapp-3.0/bug42565.jsp +++ b/test/webapp-3.0/bug42565.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 42565 test case diff --git a/test/webapp-3.0/bug44994.jsp b/test/webapp-3.0/bug44994.jsp index 43410d004..47d8c1104 100644 --- a/test/webapp-3.0/bug44994.jsp +++ b/test/webapp-3.0/bug44994.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 44994 test case diff --git a/test/webapp-3.0/bug45nnn/bug45015a.jsp b/test/webapp-3.0/bug45nnn/bug45015a.jsp index 3d85ba424..096e08da5 100644 --- a/test/webapp-3.0/bug45nnn/bug45015a.jsp +++ b/test/webapp-3.0/bug45nnn/bug45015a.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 45015 test case A diff --git a/test/webapp-3.0/bug45nnn/bug45015b.jsp b/test/webapp-3.0/bug45nnn/bug45015b.jsp index a032a1109..2b3e9461a 100644 --- a/test/webapp-3.0/bug45nnn/bug45015b.jsp +++ b/test/webapp-3.0/bug45nnn/bug45015b.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 45015 test case B diff --git a/test/webapp-3.0/bug45nnn/bug45015c.jsp b/test/webapp-3.0/bug45nnn/bug45015c.jsp index 00d86fe72..ceb740b73 100644 --- a/test/webapp-3.0/bug45nnn/bug45015c.jsp +++ b/test/webapp-3.0/bug45nnn/bug45015c.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 45015 test case C diff --git a/test/webapp-3.0/bug45nnn/bug45427.jsp b/test/webapp-3.0/bug45nnn/bug45427.jsp index 41cd19ba8..fb7af4501 100644 --- a/test/webapp-3.0/bug45nnn/bug45427.jsp +++ b/test/webapp-3.0/bug45nnn/bug45427.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 45427 test case diff --git a/test/webapp-3.0/bug45nnn/bug45451a.jsp b/test/webapp-3.0/bug45nnn/bug45451a.jsp index f3a67f4d9..43bbe47d6 100644 --- a/test/webapp-3.0/bug45nnn/bug45451a.jsp +++ b/test/webapp-3.0/bug45nnn/bug45451a.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 45451 test case diff --git a/test/webapp-3.0/bug45nnn/bug45511.jsp b/test/webapp-3.0/bug45nnn/bug45511.jsp index 6279eba72..d643cf9e1 100644 --- a/test/webapp-3.0/bug45nnn/bug45511.jsp +++ b/test/webapp-3.0/bug45nnn/bug45511.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 45511 test case diff --git a/test/webapp-3.0/bug46381.jsp b/test/webapp-3.0/bug46381.jsp index 629a15c43..fbd0b0594 100644 --- a/test/webapp-3.0/bug46381.jsp +++ b/test/webapp-3.0/bug46381.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 46381 test case <% diff --git a/test/webapp-3.0/bug46596.jsp b/test/webapp-3.0/bug46596.jsp index 6da57924e..d9a1da817 100644 --- a/test/webapp-3.0/bug46596.jsp +++ b/test/webapp-3.0/bug46596.jsp @@ -1,5 +1,3 @@ -<%@ taglib uri="http://tomcat.apache.org/testerFunctions" prefix="fn" %> -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib uri="http://tomcat.apache.org/testerFunctions" prefix="fn" %> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 46596 test case diff --git a/test/webapp-3.0/bug47331.jsp b/test/webapp-3.0/bug47331.jsp index a174dc3c1..eca3a1a1f 100644 --- a/test/webapp-3.0/bug47331.jsp +++ b/test/webapp-3.0/bug47331.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 47331 test case diff --git a/test/webapp-3.0/bug47413.jsp b/test/webapp-3.0/bug47413.jsp index eb79ae1e0..155e42963 100644 --- a/test/webapp-3.0/bug47413.jsp +++ b/test/webapp-3.0/bug47413.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 47413 test case diff --git a/test/webapp-3.0/bug48nnn/bug48112.jsp b/test/webapp-3.0/bug48nnn/bug48112.jsp index 356e680f4..d418b6cd0 100644 --- a/test/webapp-3.0/bug48nnn/bug48112.jsp +++ b/test/webapp-3.0/bug48nnn/bug48112.jsp @@ -1,5 +1,3 @@ -<%@ taglib uri="http://tomcat.apache.org/testerFunctions" prefix="fn" %> -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib uri="http://tomcat.apache.org/testerFunctions" prefix="fn" %> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 48112 test case diff --git a/test/webapp-3.0/bug48nnn/bug48627.jsp b/test/webapp-3.0/bug48nnn/bug48627.jsp index 54a79fac4..5716506c5 100644 --- a/test/webapp-3.0/bug48nnn/bug48627.jsp +++ b/test/webapp-3.0/bug48nnn/bug48627.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Bug 46596 test case diff --git a/test/webapp-3.0/el-method.jsp b/test/webapp-3.0/el-method.jsp index cc930dc9a..bbb74c15e 100644 --- a/test/webapp-3.0/el-method.jsp +++ b/test/webapp-3.0/el-method.jsp @@ -1,6 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> -<%@ page import="org.apache.el.TesterBeanA" %> -<%@ page import="org.apache.el.TesterBeanB" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> +<%@ page import="org.apache.el.TesterBeanA" %> +<%@ page import="org.apache.el.TesterBeanB" %> EL method test cases diff --git a/test/webapp-3.0/el-misc.jsp b/test/webapp-3.0/el-misc.jsp index 053252bac..cf1d8a7f1 100644 --- a/test/webapp-3.0/el-misc.jsp +++ b/test/webapp-3.0/el-misc.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Misc EL test cases diff --git a/test/webapp-3.0/script-expr.jsp b/test/webapp-3.0/script-expr.jsp index eaa8caf92..1f4322583 100644 --- a/test/webapp-3.0/script-expr.jsp +++ b/test/webapp-3.0/script-expr.jsp @@ -1,4 +1,3 @@ -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> <%-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> Scripting expression test cases diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp index a998b42c6..e0d68e2cc 100644 --- a/webapps/ROOT/index.jsp +++ b/webapps/ROOT/index.jsp @@ -1,4 +1,3 @@ - + <% java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy"); request.setAttribute("year", sdf.format(new java.util.Date())); diff --git a/webapps/examples/jsp/cal/cal1.jsp b/webapps/examples/jsp/cal/cal1.jsp index 42d41976e..db89af6fc 100644 --- a/webapps/examples/jsp/cal/cal1.jsp +++ b/webapps/examples/jsp/cal/cal1.jsp @@ -1,4 +1,3 @@ - + Calendar: A JSP APPLICATION diff --git a/webapps/examples/jsp/cal/cal2.jsp b/webapps/examples/jsp/cal/cal2.jsp index b2295de89..ca9dc06c0 100644 --- a/webapps/examples/jsp/cal/cal2.jsp +++ b/webapps/examples/jsp/cal/cal2.jsp @@ -1,4 +1,3 @@ - - + Calendar: A JSP APPLICATION diff --git a/webapps/examples/jsp/chat/index.jsp b/webapps/examples/jsp/chat/index.jsp index e0b37298a..62fdea11b 100644 --- a/webapps/examples/jsp/chat/index.jsp +++ b/webapps/examples/jsp/chat/index.jsp @@ -1,11 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" %> -<% if (session.getAttribute("nickname") == null) { - response.sendRedirect("login.jsp"); - return; -} -%> - - +<%@page contentType="text/html; charset=UTF-8" %> +<% if (session.getAttribute("nickname") == null) { + response.sendRedirect("login.jsp"); + return; +} +%> + + JSP Chat diff --git a/webapps/examples/jsp/chat/login.jsp b/webapps/examples/jsp/chat/login.jsp index 551ca3426..e9a653fd6 100644 --- a/webapps/examples/jsp/chat/login.jsp +++ b/webapps/examples/jsp/chat/login.jsp @@ -1,6 +1,3 @@ - -<%@page contentType="text/html; charset=UTF-8" %> - + +<%@page contentType="text/html; charset=UTF-8" %> + JSP Chat diff --git a/webapps/examples/jsp/chat/post.jsp b/webapps/examples/jsp/chat/post.jsp index 69dde5167..b2b3e09c7 100644 --- a/webapps/examples/jsp/chat/post.jsp +++ b/webapps/examples/jsp/chat/post.jsp @@ -1,6 +1,3 @@ - -<%@page contentType="text/html; charset=UTF-8" %> - + +<%@page contentType="text/html; charset=UTF-8" %> + JSP Chat diff --git a/webapps/examples/jsp/checkbox/checkresult.jsp b/webapps/examples/jsp/checkbox/checkresult.jsp index 4b7fa96d7..52c85ea0f 100644 --- a/webapps/examples/jsp/checkbox/checkresult.jsp +++ b/webapps/examples/jsp/checkbox/checkresult.jsp @@ -1,4 +1,3 @@ - - + <%! String[] fruits; %> diff --git a/webapps/examples/jsp/colors/colrs.jsp b/webapps/examples/jsp/colors/colrs.jsp index f7661968a..95e4dd33a 100644 --- a/webapps/examples/jsp/colors/colrs.jsp +++ b/webapps/examples/jsp/colors/colrs.jsp @@ -1,4 +1,3 @@ - + diff --git a/webapps/examples/jsp/dates/date.jsp b/webapps/examples/jsp/dates/date.jsp index 84c2724e1..a818718f3 100644 --- a/webapps/examples/jsp/dates/date.jsp +++ b/webapps/examples/jsp/dates/date.jsp @@ -1,4 +1,3 @@ - + <%@ page session="false"%> diff --git a/webapps/examples/jsp/error/err.jsp b/webapps/examples/jsp/error/err.jsp index dc5d98b0e..152976f05 100644 --- a/webapps/examples/jsp/error/err.jsp +++ b/webapps/examples/jsp/error/err.jsp @@ -1,4 +1,3 @@ - + <%@ page errorPage="errorpge.jsp" %> diff --git a/webapps/examples/jsp/error/errorpge.jsp b/webapps/examples/jsp/error/errorpge.jsp index e52ccfc72..be8ba20a6 100644 --- a/webapps/examples/jsp/error/errorpge.jsp +++ b/webapps/examples/jsp/error/errorpge.jsp @@ -1,4 +1,3 @@ - + diff --git a/webapps/examples/jsp/forward/forward.jsp b/webapps/examples/jsp/forward/forward.jsp index b395aa78a..72147b39e 100644 --- a/webapps/examples/jsp/forward/forward.jsp +++ b/webapps/examples/jsp/forward/forward.jsp @@ -1,4 +1,3 @@ - - + <% double freeMem = Runtime.getRuntime().freeMemory(); double totlMem = Runtime.getRuntime().totalMemory(); diff --git a/webapps/examples/jsp/forward/one.jsp b/webapps/examples/jsp/forward/one.jsp index 39441df24..4ef090cce 100644 --- a/webapps/examples/jsp/forward/one.jsp +++ b/webapps/examples/jsp/forward/one.jsp @@ -1,4 +1,3 @@ - + diff --git a/webapps/examples/jsp/include/include.jsp b/webapps/examples/jsp/include/include.jsp index 706ff7e40..5a00faef0 100644 --- a/webapps/examples/jsp/include/include.jsp +++ b/webapps/examples/jsp/include/include.jsp @@ -1,4 +1,3 @@ - + diff --git a/webapps/examples/jsp/jsptoserv/hello.jsp b/webapps/examples/jsp/jsptoserv/hello.jsp index ea810508e..a65721942 100644 --- a/webapps/examples/jsp/jsptoserv/hello.jsp +++ b/webapps/examples/jsp/jsptoserv/hello.jsp @@ -1,4 +1,3 @@ - +

diff --git a/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp b/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp index 5a7e57f84..62e3b2df7 100644 --- a/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp +++ b/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp @@ -1,4 +1,3 @@ - + diff --git a/webapps/examples/jsp/plugin/plugin.jsp b/webapps/examples/jsp/plugin/plugin.jsp index 548a110e2..7711e7aa5 100644 --- a/webapps/examples/jsp/plugin/plugin.jsp +++ b/webapps/examples/jsp/plugin/plugin.jsp @@ -1,4 +1,3 @@ - + Plugin example

Current time is :

diff --git a/webapps/examples/jsp/sessions/carts.jsp b/webapps/examples/jsp/sessions/carts.jsp index 3a3f6fcd4..cad0b975a 100644 --- a/webapps/examples/jsp/sessions/carts.jsp +++ b/webapps/examples/jsp/sessions/carts.jsp @@ -1,4 +1,3 @@ - - + diff --git a/webapps/examples/jsp/simpletag/foo.jsp b/webapps/examples/jsp/simpletag/foo.jsp index d86fe0208..92200d047 100644 --- a/webapps/examples/jsp/simpletag/foo.jsp +++ b/webapps/examples/jsp/simpletag/foo.jsp @@ -1,4 +1,3 @@ - + <%@ taglib uri="http://tomcat.apache.org/example-taglib" prefix="eg"%> diff --git a/webapps/examples/jsp/snp/snoop.jsp b/webapps/examples/jsp/snp/snoop.jsp index c8561dec6..ec31b0dde 100644 --- a/webapps/examples/jsp/snp/snoop.jsp +++ b/webapps/examples/jsp/snp/snoop.jsp @@ -1,4 +1,3 @@ - - +

Request Information

-- 2.11.0