craigmcc 01/03/17 11:48:22
Modified: tester/src/bin tester.xml
tester/web/WEB-INF web.xml
Added: tester/web Xerces00.jsp Xerces02.jsp
Log:
Add some additional tests to access JSP pages both before and after a
servlet that uses Xerces itself.
Revision Changes Path
1.21 +23 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tester.xml 2001/03/13 19:10:42 1.20
+++ tester.xml 2001/03/17 19:48:20 1.21
@@ -550,6 +550,18 @@
<!-- ========== Xerces Sealing Violation Test ========================= -->
<tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Xerces00.jsp" debug="${debug}"
+ outContent="Xerces00 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Xerces00" debug="${debug}"
+ outContent="Xerces00 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedXerces00" debug="${debug}"
+ outContent="Xerces00 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/Xerces01" debug="${debug}"
outContent="Xerces01 PASSED"/>
@@ -557,6 +569,17 @@
request="${context.path}/WrappedXerces01" debug="${debug}"
outContent="Xerces01 PASSED"/>
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Xerces02.jsp" debug="${debug}"
+ outContent="Xerces02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Xerces02" debug="${debug}"
+ outContent="Xerces02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedXerces02" debug="${debug}"
+ outContent="Xerces02 PASSED"/>
</target>
1.1 jakarta-tomcat-4.0/tester/web/Xerces00.jsp
Index: Xerces00.jsp
===================================================================
<!DOCTYPE root
PUBLIC "-//Sun Microsystems Inc.//DTD JavaServer Pages Version 1.2//EN"
"http://java.sun.com/products/jsp/dtd/jspcore_1_2.dtd" >
<!-- This File is generated automatically by jsp2XML converter tool -->
<!-- Written By Ramesh Mandava/Santosh Singh -->
<jsp:root
xmlns:jsp="http://java.sun.com/products/jsp/dtd/jsp_1_2.dtd"
><jsp:directive.page contentType="text/plain"
/><jsp:cdata><![CDATA[Xerces00 PASSED]]></jsp:cdata>
</jsp:root>
1.1 jakarta-tomcat-4.0/tester/web/Xerces02.jsp
Index: Xerces02.jsp
===================================================================
<%@ page contentType="text/plain"%>Xerces02 PASSED
1.14 +40 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- web.xml 2001/03/13 19:06:22 1.13
+++ web.xml 2001/03/17 19:48:21 1.14
@@ -172,9 +172,19 @@
<filter-mapping>
<filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedXerces00</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
<url-pattern>/WrappedXerces01</url-pattern>
</filter-mapping>
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedXerces02</url-pattern>
+ </filter-mapping>
+
<!-- ========== Servlet Definitions =================================== -->
@@ -324,11 +334,21 @@
</servlet>
<servlet>
+ <servlet-name>Xerces00</servlet-name>
+ <jsp-file>/Xerces00.jsp</jsp-file>
+ </servlet>
+
+ <servlet>
<servlet-name>Xerces01</servlet-name>
<servlet-class>org.apache.tester.Xerces01</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>Xerces02</servlet-name>
+ <jsp-file>/Xerces02.jsp</jsp-file>
+ </servlet>
+
<!-- ========== Servlet Mappings ====================================== -->
<servlet-mapping>
@@ -617,6 +637,16 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>Xerces00</servlet-name>
+ <url-pattern>/Xerces00</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Xerces00</servlet-name>
+ <url-pattern>/WrappedXerces00</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>Xerces01</servlet-name>
<url-pattern>/Xerces01</url-pattern>
</servlet-mapping>
@@ -624,6 +654,16 @@
<servlet-mapping>
<servlet-name>Xerces01</servlet-name>
<url-pattern>/WrappedXerces01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Xerces02</servlet-name>
+ <url-pattern>/Xerces02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Xerces02</servlet-name>
+ <url-pattern>/WrappedXerces02</url-pattern>
</servlet-mapping>
