Author: kkolinko
Date: Tue Jun 2 15:36:39 2009
New Revision: 781067
URL: http://svn.apache.org/viewvc?rev=781067&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47263
Fix license headers in TC 5.5 tester module where they caused the tests to fail
Added:
tomcat/container/tc5.5.x/tester/web/golden/ErrorPage06html.txt
- copied unchanged from r779992,
tomcat/container/tc5.5.x/tester/web/ErrorPage06.html
Modified:
tomcat/container/tc5.5.x/tester/src/bin/tester.xml
tomcat/container/tc5.5.x/tester/web/Authentication04.jsp
tomcat/container/tc5.5.x/tester/web/Encoding01.jsp
tomcat/container/tc5.5.x/tester/web/Encoding02.jsp
tomcat/container/tc5.5.x/tester/web/Encoding03.jsp
tomcat/container/tc5.5.x/tester/web/ErrorPage06.jsp
tomcat/container/tc5.5.x/tester/web/ErrorPage08.jsp
tomcat/container/tc5.5.x/tester/web/ErrorPage10.jsp
tomcat/container/tc5.5.x/tester/web/FilterResponse02.jsp
tomcat/container/tc5.5.x/tester/web/Forward00b.jsp
tomcat/container/tc5.5.x/tester/web/Forward00c.jsp
tomcat/container/tc5.5.x/tester/web/Forward00e.jsp
tomcat/container/tc5.5.x/tester/web/Forward03b.jsp
tomcat/container/tc5.5.x/tester/web/Forward04b.jsp
tomcat/container/tc5.5.x/tester/web/Forward05b.jsp
tomcat/container/tc5.5.x/tester/web/Forward06b.jsp
tomcat/container/tc5.5.x/tester/web/Include00b.jsp
tomcat/container/tc5.5.x/tester/web/Include00c.jsp
tomcat/container/tc5.5.x/tester/web/Include00e.jsp
tomcat/container/tc5.5.x/tester/web/Include03c.jsp
tomcat/container/tc5.5.x/tester/web/Include05b.jsp
tomcat/container/tc5.5.x/tester/web/Include06.jsp
tomcat/container/tc5.5.x/tester/web/Include06b.jsp
tomcat/container/tc5.5.x/tester/web/JspBeans01.jsp
tomcat/container/tc5.5.x/tester/web/JspBeans02.jsp
tomcat/container/tc5.5.x/tester/web/JspBeans03.jsp
tomcat/container/tc5.5.x/tester/web/JspDoc01.jsp
tomcat/container/tc5.5.x/tester/web/JspDoc02.jsp
tomcat/container/tc5.5.x/tester/web/JspForward01a.jsp
tomcat/container/tc5.5.x/tester/web/JspInclude01.jsp
tomcat/container/tc5.5.x/tester/web/JspInclude01a.jsp
tomcat/container/tc5.5.x/tester/web/JspInclude02.jsp
tomcat/container/tc5.5.x/tester/web/JspInclude02a.jsp
tomcat/container/tc5.5.x/tester/web/Property01.jsp
tomcat/container/tc5.5.x/tester/web/Redirect02a.jsp
tomcat/container/tc5.5.x/tester/web/Redirect03a.jsp
tomcat/container/tc5.5.x/tester/web/ResponseWrap01b.jsp
tomcat/container/tc5.5.x/tester/web/ResponseWrap01d.jsp
tomcat/container/tc5.5.x/tester/web/Session07b.jsp
tomcat/container/tc5.5.x/tester/web/WrappedFilterResponse02.jsp
tomcat/container/tc5.5.x/tester/web/Xerces02.jsp
Modified: tomcat/container/tc5.5.x/tester/src/bin/tester.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/src/bin/tester.xml?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/src/bin/tester.xml (original)
+++ tomcat/container/tc5.5.x/tester/src/bin/tester.xml Tue Jun 2 15:36:39 2009
@@ -289,13 +289,13 @@
request="${context.path}/ErrorPage05?type=Number"
debug="${debug}"
status="500"
- outContent="ErrorPage06 PASSED - HTML"/>
+ golden="${golden.path}/ErrorPage06html.txt"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedErrorPage05?type=Number"
debug="${debug}"
status="500"
- outContent="ErrorPage06 PASSED - HTML"/>
+ golden="${golden.path}/ErrorPage06html.txt"/>
<!-- ========== Load On Startup Exception Handling ==================== -->
@@ -340,13 +340,13 @@
request="${context.path}/ErrorPage08?type=Number"
debug="${debug}"
status="500"
- outContent="ErrorPage06 PASSED - HTML"/>
+ golden="${golden.path}/ErrorPage06html.txt"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedErrorPage08?type=Number"
debug="${debug}"
status="500"
- outContent="ErrorPage06 PASSED - HTML"/>
+ golden="${golden.path}/ErrorPage06html.txt"/>
<!-- ========== Exception Mapping (JSP Error Page) ==================== -->
Modified: tomcat/container/tc5.5.x/tester/web/Authentication04.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Authentication04.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Authentication04.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Authentication04.jsp Tue Jun 2
15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %><%
+
+--%><%@ page contentType="text/plain" %><%
StringBuffer results = new StringBuffer();
String remoteUser = request.getRemoteUser();
if (remoteUser == null) {
Modified: tomcat/container/tc5.5.x/tester/web/Encoding01.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Encoding01.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Encoding01.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Encoding01.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
+--%>
<%@ page contentType="text/html;charset=SJIS" %>
<h2>Test Character</h2>
Modified: tomcat/container/tc5.5.x/tester/web/Encoding02.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Encoding02.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Encoding02.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Encoding02.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<html>
+
+--%><html>
<head>
<title>Encoding02.jsp</title>
</head>
Modified: tomcat/container/tc5.5.x/tester/web/Encoding03.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Encoding03.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Encoding03.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Encoding03.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<html>
+
+--%><html>
<head>
<title>Encoding03.jsp</title>
</head>
Modified: tomcat/container/tc5.5.x/tester/web/ErrorPage06.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/ErrorPage06.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/ErrorPage06.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/ErrorPage06.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %><%
+
+--%><%@ page contentType="text/plain" %><%
// Accumulate all the reasons this request might fail
StringBuffer sb = new StringBuffer();
Modified: tomcat/container/tc5.5.x/tester/web/ErrorPage08.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/ErrorPage08.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/ErrorPage08.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/ErrorPage08.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %><%
+
+--%><%@ page contentType="text/plain" %><%
// Write a FAILED message that should get replaced by the error text
out.println("ErrorPage08 FAILED - Original response returned");
Modified: tomcat/container/tc5.5.x/tester/web/ErrorPage10.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/ErrorPage10.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/ErrorPage10.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/ErrorPage10.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" isErrorPage="true" %><%
+
+--%><%@ page contentType="text/plain" isErrorPage="true" %><%
// Accumulate all the reasons this request might fail
StringBuffer sb = new StringBuffer();
Modified: tomcat/container/tc5.5.x/tester/web/FilterResponse02.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/FilterResponse02.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/FilterResponse02.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/FilterResponse02.jsp Tue Jun 2
15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %>FilterResponse02 PASSED
+
+--%><%@ page contentType="text/plain" %>FilterResponse02 PASSED
<%
while (true) {
String message = org.apache.tester.StaticLogger.read();
Modified: tomcat/container/tc5.5.x/tester/web/Forward00b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Forward00b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Forward00b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Forward00b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %>Forward00b PASSED
+
+--%><%@ page contentType="text/plain" %>Forward00b PASSED
requestURI=<%= request.getRequestURI() %>
contextPath=<%= request.getContextPath() %>
servletPath=<%= request.getServletPath() %>
Modified: tomcat/container/tc5.5.x/tester/web/Forward00c.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Forward00c.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Forward00c.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Forward00c.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %>Forward00c PASSED
+
+--%><%@ page contentType="text/plain" %>Forward00c PASSED
requestURI=<%= request.getRequestURI() %>
contextPath=<%= request.getContextPath() %>
servletPath=<%= request.getServletPath() %>
Modified: tomcat/container/tc5.5.x/tester/web/Forward00e.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Forward00e.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Forward00e.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Forward00e.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %>Forward00e PASSED
+
+--%><%@ page contentType="text/plain" %>Forward00e PASSED
requestURI=<%= request.getRequestURI() %>
contextPath=<%= request.getContextPath() %>
servletPath=<%= request.getServletPath() %>
Modified: tomcat/container/tc5.5.x/tester/web/Forward03b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Forward03b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Forward03b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Forward03b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%
+
+--%><%
String specials[] =
{ "javax.servlet.include.request_uri",
"javax.servlet.include.context_path",
Modified: tomcat/container/tc5.5.x/tester/web/Forward04b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Forward04b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Forward04b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Forward04b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>Forward04b.jsp PASSED
+
+--%><%@ page contentType="text/plain" %>Forward04b.jsp PASSED
Modified: tomcat/container/tc5.5.x/tester/web/Forward05b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Forward05b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Forward05b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Forward05b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>Forward05b.jsp PASSED
+
+--%><%@ page contentType="text/plain" %>Forward05b.jsp PASSED
Modified: tomcat/container/tc5.5.x/tester/web/Forward06b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Forward06b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Forward06b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Forward06b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>Forward06b.jsp PASSED
+
+--%><%@ page contentType="text/plain" %>Forward06b.jsp PASSED
Modified: tomcat/container/tc5.5.x/tester/web/Include00b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Include00b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Include00b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Include00b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" session="false" %>Include00b PASSED
+
+--%><%@ page contentType="text/plain" session="false" %>Include00b PASSED
requestURI=<%= request.getRequestURI() %>
contextPath=<%= request.getContextPath() %>
servletPath=<%= request.getServletPath() %>
Modified: tomcat/container/tc5.5.x/tester/web/Include00c.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Include00c.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Include00c.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Include00c.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" session="false"%>Include00c PASSED
+
+--%><%@ page contentType="text/plain" session="false"%>Include00c PASSED
requestURI=<%= request.getRequestURI() %>
contextPath=<%= request.getContextPath() %>
servletPath=<%= request.getServletPath() %>
Modified: tomcat/container/tc5.5.x/tester/web/Include00e.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Include00e.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Include00e.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Include00e.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" session="false" %>Include00e PASSED
+
+--%><%@ page contentType="text/plain" session="false" %>Include00e PASSED
requestURI=<%= request.getRequestURI() %>
contextPath=<%= request.getContextPath() %>
servletPath=<%= request.getServletPath() %>
Modified: tomcat/container/tc5.5.x/tester/web/Include03c.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Include03c.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Include03c.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Include03c.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %><%
+
+--%><%@ page contentType="text/plain" %><%
// Duplicate logic from "Include03.java"
StringBuffer sb = new StringBuffer();
String path = request.getParameter("path");
Modified: tomcat/container/tc5.5.x/tester/web/Include05b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Include05b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Include05b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Include05b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-Include05b PASSED
+
+--%>Include05b PASSED
Modified: tomcat/container/tc5.5.x/tester/web/Include06.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Include06.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Include06.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Include06.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,7 +13,7 @@
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.
--->
-<%@ page contentType="text/plain" %>==========
+
+--%><%@ page contentType="text/plain" %>==========
<jsp:include page="servlet/org.apache.tester.Include06a"
flush="false"/>==========
<jsp:include page="/Include06b.jsp"/>==========
Modified: tomcat/container/tc5.5.x/tester/web/Include06b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Include06b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Include06b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Include06b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-Include06b.jsp output
+
+--%>Include06b.jsp output
Modified: tomcat/container/tc5.5.x/tester/web/JspBeans01.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspBeans01.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspBeans01.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspBeans01.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %><jsp:useBean id="bean"
class="org.apache.tester.SessionBean"/>JspBeans01 PASSED
+
+--%><%@ page contentType="text/plain" %><jsp:useBean id="bean"
class="org.apache.tester.SessionBean"/>JspBeans01 PASSED
lifecycle = <%= bean.getLifecycle() %>
stringProperty= <%= bean.getStringProperty() %>
toString = <%= bean.toString() %>
Modified: tomcat/container/tc5.5.x/tester/web/JspBeans02.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspBeans02.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspBeans02.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspBeans02.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %><jsp:useBean id="bean"
class="org.apache.tester.shared.SharedSessionBean"/>JspBeans02 PASSED
+
+--%><%@ page contentType="text/plain" %><jsp:useBean id="bean"
class="org.apache.tester.shared.SharedSessionBean"/>JspBeans02 PASSED
lifecycle = <%= bean.getLifecycle() %>
stringProperty= <%= bean.getStringProperty() %>
toString = <%= bean.toString() %>
Modified: tomcat/container/tc5.5.x/tester/web/JspBeans03.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspBeans03.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspBeans03.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspBeans03.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %><jsp:useBean id="bean"
class="org.apache.tester.unshared.UnsharedSessionBean"/>JspBeans03 PASSED
+
+--%><%@ page contentType="text/plain" %><jsp:useBean id="bean"
class="org.apache.tester.unshared.UnsharedSessionBean"/>JspBeans03 PASSED
lifecycle = <%= bean.getLifecycle() %>
stringProperty= <%= bean.getStringProperty() %>
toString = <%= bean.toString() %>
Modified: tomcat/container/tc5.5.x/tester/web/JspDoc01.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspDoc01.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspDoc01.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspDoc01.jsp Tue Jun 2 15:36:39 2009
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -13,8 +14,8 @@
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.
+
-->
-<?xml version="1.0"?>
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="1.2">
<a>text<b></b></a>
<jsp:text><a>text<b></b></a></jsp:text>
Modified: tomcat/container/tc5.5.x/tester/web/JspDoc02.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspDoc02.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspDoc02.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspDoc02.jsp Tue Jun 2 15:36:39 2009
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -13,8 +14,8 @@
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.
+
-->
-<?xml version="1.0"?>
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page";
version="1.2">
<jsp:directive.page contentType="text/html"/>
Modified: tomcat/container/tc5.5.x/tester/web/JspForward01a.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspForward01a.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspForward01a.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspForward01a.jsp Tue Jun 2 15:36:39
2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>JspForward01a PASSED
+
+--%><%@ page contentType="text/plain" %>JspForward01a PASSED
Modified: tomcat/container/tc5.5.x/tester/web/JspInclude01.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspInclude01.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspInclude01.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspInclude01.jsp Tue Jun 2 15:36:39
2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %>This is before the include
+
+--%><%@ page contentType="text/plain" %>This is before the include
<jsp:include page="<%= request.getParameter(\"path\") %>" flush="true"/>
This is after the include
Modified: tomcat/container/tc5.5.x/tester/web/JspInclude01a.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspInclude01a.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspInclude01a.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspInclude01a.jsp Tue Jun 2 15:36:39
2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>This is the include
+
+--%><%@ page contentType="text/plain" %>This is the include
Modified: tomcat/container/tc5.5.x/tester/web/JspInclude02.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspInclude02.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspInclude02.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspInclude02.jsp Tue Jun 2 15:36:39
2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %>This is before the include
+
+--%><%@ page contentType="text/plain" %>This is before the include
<jsp:include page="<%= request.getParameter(\"path\") %>" flush="false"/>
This is after the include
Modified: tomcat/container/tc5.5.x/tester/web/JspInclude02a.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/JspInclude02a.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/JspInclude02a.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/JspInclude02a.jsp Tue Jun 2 15:36:39
2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>This is the include
+
+--%><%@ page contentType="text/plain" %>This is the include
Modified: tomcat/container/tc5.5.x/tester/web/Property01.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Property01.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Property01.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Property01.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<html>
+
+--%><html>
<head>
<title>Property01.jsp - Positive PropertyEditor Test</title>
</head>
Modified: tomcat/container/tc5.5.x/tester/web/Redirect02a.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Redirect02a.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Redirect02a.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Redirect02a.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>Redirect02a.jsp PASSED
+
+--%><%@ page contentType="text/plain" %>Redirect02a.jsp PASSED
Modified: tomcat/container/tc5.5.x/tester/web/Redirect03a.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Redirect03a.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Redirect03a.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Redirect03a.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>Redirect03a.jsp PASSED
+
+--%><%@ page contentType="text/plain" %>Redirect03a.jsp PASSED
Modified: tomcat/container/tc5.5.x/tester/web/ResponseWrap01b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/ResponseWrap01b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/ResponseWrap01b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/ResponseWrap01b.jsp Tue Jun 2 15:36:39
2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain"%>ResponseWrap01b PASSED
+
+--%><%@ page contentType="text/plain"%>ResponseWrap01b PASSED
Modified: tomcat/container/tc5.5.x/tester/web/ResponseWrap01d.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/ResponseWrap01d.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/ResponseWrap01d.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/ResponseWrap01d.jsp Tue Jun 2 15:36:39
2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain"%>ResponseWrap01d PASSED
+
+--%><%@ page contentType="text/plain"%>ResponseWrap01d PASSED
Modified: tomcat/container/tc5.5.x/tester/web/Session07b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Session07b.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Session07b.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Session07b.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,8 +13,8 @@
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.
--->
-<%@ page contentType="text/plain" %><jsp:useBean id="simpleBean"
+
+--%><%@ page contentType="text/plain" %><jsp:useBean id="simpleBean"
scope="session" class="org.apache.tester.SessionBean"/><%
if ("From Session07a".equals(simpleBean.getStringProperty())) {
out.println("Session07 PASSED");
Modified: tomcat/container/tc5.5.x/tester/web/WrappedFilterResponse02.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/WrappedFilterResponse02.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/WrappedFilterResponse02.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/WrappedFilterResponse02.jsp Tue Jun 2
15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain" %>FilterResponse02 PASSED
+
+--%><%@ page contentType="text/plain" %>FilterResponse02 PASSED
Modified: tomcat/container/tc5.5.x/tester/web/Xerces02.jsp
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Xerces02.jsp?rev=781067&r1=781066&r2=781067&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/web/Xerces02.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Xerces02.jsp Tue Jun 2 15:36:39 2009
@@ -1,4 +1,4 @@
-<!--
+<%--
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.
@@ -13,5 +13,5 @@
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.
--->
-<%@ page contentType="text/plain"%>Xerces02 PASSED
+
+--%><%@ page contentType="text/plain"%>Xerces02 PASSED
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
