craigmcc 01/03/14 19:24:13
Modified: tester Tag: J2EE_13_BRANCH build.xml
tester/src/bin Tag: J2EE_13_BRANCH tester.xml
tester/src/tester/org/apache/tester Tag: J2EE_13_BRANCH
SetBufferSize01.java TestClient.java
tester/web/WEB-INF Tag: J2EE_13_BRANCH web.xml
Added: tester/src/tester/org/apache/tester Tag: J2EE_13_BRANCH
Aggregate01.java Aggregate02.java ErrorPage01.java
ErrorPage02.java ErrorPage03.java ErrorPage04.java
Include02.java Include02a.java Jndi01.java
Jndi02.java Resources01.java Resources02.java
Resources03.java Resources04.java Session01.java
Session02.java Session03.java SessionBean.java
TesterException.java Xerces01.java
Xerces01Parser.java
Log:
Create branch for J2EE RI, and port the current unit test suite from the
HEAD branch. Currently, the following unit tests fail:
- ErrorPage: All
- Resources: #4, #5, #14, #15
- ServletResponse: #3, #4
- HttpSession: #4, #8
but these will be corrected as the corresponding bug fix patches get
ported into the branch.
Revision Changes Path
No revision
No revision
1.1.2.1 +1 -1 jakarta-tomcat-4.0/tester/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/build.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build.xml 2000/12/18 05:06:12 1.1
+++ build.xml 2001/03/15 03:24:06 1.1.2.1
@@ -3,7 +3,7 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="servletapi.home" value="../../jakarta-servletapi"/>
+ <property name="servletapi.home" value="../../jakarta-servletapi-4"/>
<property name="tester.build" value="../../build/tester"/>
<property name="tester.deploy" value="../../build/tomcat-4.0"/>
<property name="tester.dist" value="../../dist/tester"/>
No revision
No revision
1.7.2.1 +355 -39 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.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- tester.xml 2001/01/06 02:38:12 1.7
+++ tester.xml 2001/03/15 03:24:06 1.7.2.1
@@ -2,15 +2,17 @@
<!-- ========== Global Properties ======================================= -->
<property name="catalina.home" value="../../build/tomcat-4.0"/>
+ <property name="debug" value="0"/>
<property name="host" value="localhost"/>
<property name="port" value="8080"/>
<!-- <property name="protocol" value="HTTP/1.0"/> -->
<property name="protocol" value=""/> <!-- Use HttpURLConnection -->
<property name="context.path" value="/tester"/>
+ <property name="manager.path" value="/manager"/>
<taskdef name="tester" classname="org.apache.tester.TestClient"/>
- <target name="all"
depends="ROOT,CaseSensitive,RequestDispatcher,ServletRequest,ServletResponse"/>
+ <target name="all"
depends="ROOT,CaseSensitive,ErrorPage,Jndi,RequestDispatcher,Resources,ServletRequest,ServletResponse,HttpSession"/>
<target name="ROOT">
@@ -19,9 +21,19 @@
<!-- Should be able to see the home page -->
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/index.html"
+ request="/index.html" debug="${debug}"
status="200"/>
+ <!-- Should be able to use relative path to document root -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="/examples/.." debug="${debug}"
+ status="302"/>
+
+ <!-- Should not be able to use relative path above document root -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="/examples/../.." debug="${debug}"
+ status="404"/>
+
</target>
@@ -31,119 +43,372 @@
<!-- Make sure that static resources are matched case sensitively -->
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/index.HTML"
+ request="/index.HTML" debug="${debug}"
status="404"/>
<!-- Should be able to execute the Date example -->
<touch file="${catalina.home}/webapps/examples/jsp/dates/date.jsp"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/examples/jsp/dates/date.jsp"
+ request="/examples/jsp/dates/date.jsp" debug="${debug}"
status="200"/>
<!-- Should not be able to view the source of the Date example -->
<touch file="${catalina.home}/webapps/examples/jsp/dates/date.jsp"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/examples/jsp/dates/date.Jsp"
+ request="/examples/jsp/dates/date.Jsp" debug="${debug}"
status="404"/>
<!-- Should not be able to view the source of the Date example -->
<touch file="${catalina.home}/webapps/examples/jsp/dates/date.jsp"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/examples/jsp/dates/Date.jsp"
+ request="/examples/jsp/dates/Date.jsp" debug="${debug}"
status="404"/>
<!-- Should not be able to view the source of the Date example -->
<touch file="${catalina.home}/webapps/examples/jsp/dates/date.jsp"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/examples/jsp/Dates/date.jsp"
+ request="/examples/jsp/Dates/date.jsp" debug="${debug}"
status="404"/>
<!-- Should not be able to view the source of the Date example -->
<touch file="${catalina.home}/webapps/examples/jsp/dates/date.jsp"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/examples/Jsp/dates/date.jsp"
+ request="/examples/Jsp/dates/date.jsp" debug="${debug}"
status="404"/>
<!-- Should not be able to view the source of the Date example -->
<touch file="${catalina.home}/webapps/examples/jsp/dates/date.jsp"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/Examples/jsp/dates/date.jsp"
+ request="/Examples/jsp/dates/date.jsp" debug="${debug}"
status="404"/>
<!-- Should be able to execute the HelloWorld servlet example -->
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/examples/servlet/HelloWorldExample"
+ request="/examples/servlet/HelloWorldExample" debug="${debug}"
status="200"/>
<!-- Should not be able to execute HelloWorld with different cases -->
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/examples/servlet/helloWorldExample"
+ request="/examples/servlet/helloWorldExample" debug="${debug}"
status="404"/>
<!-- Should not be able to execute HelloWorld with different cases -->
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/examples/Servlet/HelloWorldExample"
+ request="/examples/Servlet/HelloWorldExample" debug="${debug}"
status="404"/>
<!-- Should not be able to execute HelloWorld with different cases -->
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="/Examples/servlet/HelloWorldExample"
+ request="/Examples/servlet/HelloWorldExample" debug="${debug}"
status="404"/>
</target>
+ <target name="ErrorPage">
+
+ <!-- ========== Error Code Mapping ==================================== -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/ErrorPage01" debug="${debug}"
+ outContent="ErrorPage02 PASSED"/>
+
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedErrorPage01" debug="${debug}"
+ outContent="ErrorPage02 PASSED"/>
+
+
+ <!-- ========== Exception Mapping ===================================== -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/ErrorPage03" debug="${debug}"
+ outContent="ErrorPage04 PASSED"/>
+
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedErrorPage03" debug="${debug}"
+ outContent="ErrorPage04 PASSED"/>
+
+
+ </target>
+
+
+ <target name="Jndi">
+
+ <!-- ========== JNDI Naming Context =================================== -->
+
+ <!-- Perform the tests before restarting the application -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Jndi01" debug="${debug}"
+ outContent="Jndi01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedJndi01" debug="${debug}"
+ outContent="Jndi01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Jndi02" debug="${debug}"
+ outContent="Jndi02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedJndi02" debug="${debug}"
+ outContent="Jndi02 PASSED"/>
+
+ <!-- Restart this web application -->
+ <!-- NOTE: Assign role "manager" to user "tomcat" for this to work -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ inHeaders="Authorization:Basic dG9tY2F0OnRvbWNhdA=="
+ request="${manager.path}/reload?path=${context.path}"
+ outContent="OK - Reloaded application at context path ${context.path}"/>
+
+ <!-- Repeat the tests to ensure the naming context is reinitialized -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Jndi01" debug="${debug}"
+ outContent="Jndi01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedJndi01" debug="${debug}"
+ outContent="Jndi01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Jndi02" debug="${debug}"
+ outContent="Jndi02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedJndi02" debug="${debug}"
+ outContent="Jndi02 PASSED"/>
+
+ </target>
+
+
<target name="RequestDispatcher">
<!-- ========== Forward and Include to Static Resource ================ -->
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="${context.path}/Forward01"
+ request="${context.path}/Forward01" debug="${debug}"
outContent="Forward01 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="${context.path}/WrappedForward01"
+ request="${context.path}/WrappedForward01" debug="${debug}"
outContent="Forward01 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="${context.path}/Include01"
+ request="${context.path}/Include01" debug="${debug}"
outContent="Include01 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="${context.path}/WrappedInclude01"
+ request="${context.path}/WrappedInclude01" debug="${debug}"
outContent="Include01 PASSED"/>
+ <!-- ========== Included Servlet Throwing Exceptions ================== -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Include02?exception=IOException"
+ outContent="Include02 PASSED" debug="${debug}"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Include02?exception=ServletException"
+ outContent="Include02 PASSED" debug="${debug}"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Include02?exception=NullPointerException"
+ outContent="Include02 PASSED" debug="${debug}"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedInclude02?exception=IOException"
+ outContent="Include02 PASSED" debug="${debug}"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedInclude02?exception=ServletException"
+ outContent="Include02 PASSED" debug="${debug}"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedInclude02?exception=NullPointerException"
+ outContent="Include02 PASSED" debug="${debug}"/>
+
</target>
+ <target name="Resources">
+
+ <!-- ========== Positive ServletContext.getResource() Tests =========== -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources01?mode=context&path=/WEB-INF/web.xml"
+ outContent="Resources01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ request="${context.path}/Resources01?mode=context&path=/Forward01.txt"
+ outContent="Resources01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ request="${context.path}/Resources01?mode=context&path=/Include01.txt"
+ outContent="Resources01 PASSED"/>
+
+ <!-- ========== Positive Class.getResource() Tests ==================== -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources01?mode=class&path=/org/apache/tester/Resources01.txt"
+ outContent="Resources01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources01?mode=class&path=/org/apache/tester/Unpacked01.txt"
+ outContent="Resources01 PASSED"/>
+
+ <!-- ========== Negative ServletContext.getResource() Tests =========== -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources02?mode=context&path=/WEB-INF/web.xml.bad"
+ outContent="Resources02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources02?mode=context&path=/Forward02.txt.bad"
+ outContent="Resources02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources02?mode=context&path=/Include02.txt.bad"
+ outContent="Resources02 PASSED"/>
+
+ <!-- ========== Negative Class.getResource() Tests ==================== -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources02?mode=class&path=/org/apache/tester/Resources02.txt.bad"
+ outContent="Resources02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources02?mode=class&path=/org/apache/tester/Unpacked02.txt.bad"
+ outContent="Resources02 PASSED"/>
+
+ <!-- ========== Positive ServletContext.getResourceAsStream() Tests === -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources03?mode=context&path=/WEB-INF/web.xml"
+ outContent="<?xml version="1.0"
encoding="ISO-8859-1"?>"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ request="${context.path}/Resources03?mode=context&path=/Forward01.txt"
+ outContent="Forward01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ request="${context.path}/Resources03?mode=context&path=/Include01.txt"
+ outContent="Include01 PASSED"/>
+
+ <!-- ========== Positive Class.getResourceAsStream() Tests ============ -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources03?mode=class&path=/org/apache/tester/Resources03.txt"
+ outContent="Resources03 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources03?mode=class&path=/org/apache/tester/Unpacked03.txt"
+ outContent="Resources03 PASSED"/>
+
+ <!-- ========== Negative ServletContext.getResourceAsStream() Tests === -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources04?mode=context&path=/WEB-INF/web.xml.bad"
+ outContent="Resources04 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources04?mode=context&path=/Forward04.txt.bad"
+ outContent="Resources04 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources04?mode=context&path=/Include04.txt.bad"
+ outContent="Resources04 PASSED"/>
+
+ <!-- ========== Negative Class.getResourceAsStream() Tests ============ -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources04?mode=class&path=/org/apache/tester/Resources04.txt.bad"
+ outContent="Resources04 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+
request="${context.path}/Resources04?mode=class&path=/org/apache/tester/Unpacked04.txt.bad"
+ outContent="Resources04 PASSED"/>
+
+ </target>
+
+
<target name="ServletRequest">
<!-- ========== Parameters and Query Strings ========================== -->
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="${context.path}/GetParameter01?foo=1"
+ request="${context.path}/GetParameter01?foo=1" debug="${debug}"
outContent="GetParameter01 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="${context.path}/WrappedGetParameter01?foo=1"
+ request="${context.path}/WrappedGetParameter01?foo=1" debug="${debug}"
outContent="GetParameter01 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/GetParameterMap00?BestLanguage=Java&BestJSP=Java2"
- outContent="GetParameterMap00 PASSED"/>
+ outContent="GetParameterMap00 PASSED" debug="${debug}"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedGetParameterMap00?BestLanguage=Java&BestJSP=Java2"
- outContent="GetParameterMap00 PASSED"/>
+ outContent="GetParameterMap00 PASSED" debug="${debug}"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/GetQueryString01?foo=1"
- outContent="GetQueryString01 PASSED"/>
+ outContent="GetQueryString01 PASSED" debug="${debug}"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedGetQueryString01?foo=1"
- outContent="GetQueryString01 PASSED"/>
+ outContent="GetQueryString01 PASSED" debug="${debug}"/>
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}" method="POST"
+ inHeaders="Content-Type:application/x-www-form-urlencoded"
+ inContent="b=3&a=2"
+ request="${context.path}/Aggregate01?a=1"
+ outContent="Aggregate01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}" method="POST"
+ inHeaders="Content-Type:application/x-www-form-urlencoded"
+ inContent="b=3&a=2"
+ request="${context.path}/WrappedAggregate01?a=1"
+ outContent="Aggregate01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}" method="POST"
+ inHeaders="Content-Type:application/x-www-form-urlencoded"
+ inContent="b=3&a=2"
+ request="${context.path}/Aggregate02?a=1"
+ outContent="Aggregate02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}" method="POST"
+ inHeaders="Content-Type:application/x-www-form-urlencoded"
+ inContent="b=3&a=2"
+ request="${context.path}/WrappedAggregate02?a=1"
+ outContent="Aggregate02 PASSED"/>
+
<!-- ========== Other ServletRequest Tests ============================ -->
<!-- Servlet compliance tests, until equivalent tests are included
@@ -154,21 +419,21 @@
setting the protocol to "HTTP/1.0" -->
<tester host="${host}" port="${port}" protocol="HTTP/1.0"
- request="${context.path}/GetHeaders01"
+ request="${context.path}/GetHeaders01" debug="${debug}"
inHeaders="Accept-Language:en-us##Accept-Language:en-gb"
outContent="GetHeaders01 PASSED"/>
<tester host="${host}" port="${port}" protocol="HTTP/1.0"
- request="${context.path}/WrappedGetHeaders01"
+ request="${context.path}/WrappedGetHeaders01" debug="${debug}"
inHeaders="Accept-Language:en-us##Accept-Language:en-gb"
outContent="GetHeaders01 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="${context.path}/GetInputStream01"
+ request="${context.path}/GetInputStream01" debug="${debug}"
outContent="GetInputStream01 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
- request="${context.path}/WrappedGetInputStream01"
+ request="${context.path}/WrappedGetInputStream01" debug="${debug}"
outContent="GetInputStream01 PASSED"/>
@@ -181,11 +446,13 @@
-->
<tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
request="${context.path}/protected/Authentication01"
inHeaders="Authorization:Basic dG9tY2F0OnRvbWNhdA=="
outContent="Authentication01 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
request="${context.path}/protected/Authentication02"
inHeaders="Authorization:Basic dG9tY2F0OnRvbWNhdA=="
outContent="Authentication02 PASSED"/>
@@ -199,32 +466,81 @@
<!-- ========== Other ServletResponse Tests =========================== -->
- <tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
- request="${context.path}/Reset01"
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Reset01" debug="${debug}"
outContent="Reset01 PASSED"/>
- <tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
- request="${context.path}/WrappedReset01"
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedReset01" debug="${debug}"
outContent="Reset01 PASSED"/>
- <tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
- request="${context.path}/SetBufferSize01"
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SetBufferSize01" debug="${debug}"
outContent="SetBufferSize01 PASSED"/>
- <tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
- request="${context.path}/WrappedSetBufferSize01"
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedSetBufferSize01" debug="${debug}"
outContent="SetBufferSize01 PASSED"/>
- <tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
- request="${context.path}/SetLocale01"
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/SetLocale01" debug="${debug}"
outContent="SetLocale01 PASSED"
outHeaders="Content-Language:en"/>
- <tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
- request="${context.path}/WrappedSetLocale01"
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedSetLocale01" debug="${debug}"
outContent="SetLocale01 PASSED"
outHeaders="Content-Language:en"/>
+
+ </target>
+
+
+ <target name="HttpSession">
+
+ <!-- ========== Session Attribute Persistence ========================= -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Session01" debug="${debug}"
+ outContent="Session01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Session02" debug="${debug}"
+ joinSession="true"
+ outContent="Session02 PASSED"/>
+
+ <!-- NOTE: Assign role "manager" to user "tomcat" for this to work -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ inHeaders="Authorization:Basic dG9tY2F0OnRvbWNhdA=="
+ request="${manager.path}/reload?path=${context.path}"
+ outContent="OK - Reloaded application at context path ${context.path}"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Session03" debug="${debug}"
+ joinSession="true"
+ outContent="Session03 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedSession01" debug="${debug}"
+ outContent="Session01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedSession02" debug="${debug}"
+ joinSession="true"
+ outContent="Session02 PASSED"/>
+
+ <!-- NOTE: Assign role "manager" to user "tomcat" for this to work -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ debug="${debug}"
+ inHeaders="Authorization:Basic dG9tY2F0OnRvbWNhdA=="
+ request="${manager.path}/reload?path=${context.path}"
+ outContent="OK - Reloaded application at context path ${context.path}"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedSession03" debug="${debug}"
+ joinSession="true"
+ outContent="Session03 PASSED"/>
</target>
No revision
No revision
1.1.2.1 +8 -6
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SetBufferSize01.java
Index: SetBufferSize01.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SetBufferSize01.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- SetBufferSize01.java 2000/12/22 22:13:07 1.1
+++ SetBufferSize01.java 2001/03/15 03:24:09 1.1.2.1
@@ -68,7 +68,7 @@
* Negative test for ServletResponse.setBufferSize().
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/12/22 22:13:07 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:09 $
*/
public class SetBufferSize01 extends GenericServlet {
@@ -92,13 +92,15 @@
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
try {
- writer.println("TEST");
+ writer.print("SetBufferSize01 ");
+ response.flushBuffer();
response.setBufferSize(100);
- response.reset();
- writer.println("SetBufferSize01 FAILED - Did not throw
IllegalStateException");
+ writer.println("FAILED - Did not throw IllegalStateException");
} catch (IllegalStateException e) {
- response.reset();
- writer.println("SetBufferSize01 PASSED");
+ writer.println("PASSED");
+ } catch (IOException e) {
+ writer.println("FAILED - flushBuffer() threw IOException");
+ throw e;
}
while (true) {
String message = StaticLogger.read();
1.4.2.1 +84 -9
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TestClient.java
Index: TestClient.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TestClient.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- TestClient.java 2001/01/03 05:50:45 1.4
+++ TestClient.java 2001/03/15 03:24:10 1.4.2.1
@@ -115,7 +115,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/01/03 05:50:45 $
+ * @version $Revision: 1.4.2.1 $ $Date: 2001/03/15 03:24:10 $
*/
public class TestClient extends Task {
@@ -194,6 +194,21 @@
/**
+ * Should we join the session whose session identifier was returned
+ * on the previous request.
+ */
+ protected boolean joinSession = false;
+
+ public boolean getJoinSession() {
+ return (this.joinSession);
+ }
+
+ public void setJoinSession(boolean joinSession) {
+ this.joinSession = true;
+ }
+
+
+ /**
* The HTTP response message to be expected in the response.
*/
protected String message = null;
@@ -308,6 +323,17 @@
}
+ // ------------------------------------------------------- Static Variables
+
+
+ /**
+ * The session identifier returned by the most recent request, or
+ * <code>null</code> if the previous request did not specify a session
+ * identifier.
+ */
+ protected static String sessionId = null;
+
+
// --------------------------------------------------------- Public Methods
@@ -355,12 +381,24 @@
conn.setDoInput(true);
if (inContent != null) {
conn.setDoOutput(true);
- inContent += "\r\n";
conn.setRequestProperty("Content-Length",
"" + inContent.length());
+ if (debug >= 1)
+ System.out.println("INPH: Content-Length: " +
+ inContent.length());
} else {
conn.setDoOutput(false);
}
+
+ // Send the session id cookie (if any)
+ if (joinSession && (sessionId != null)) {
+ conn.setRequestProperty("Cookie",
+ "JSESSIONID=" + sessionId);
+ if (debug >= 1)
+ System.out.println("INPH: Cookie: JSESSIONID=" +
+ sessionId);
+ }
+
conn.setFollowRedirects(false);
conn.setRequestMethod(method);
if (inHeaders != null) {
@@ -381,12 +419,16 @@
String name = header.substring(0, colon).trim();
String value = header.substring(colon + 1).trim();
conn.setRequestProperty(name, value);
+ if (debug >= 1)
+ System.out.println("INPH: " + name + ": " + value);
}
}
// Connect to the server and send our output if necessary
conn.connect();
if (inContent != null) {
+ if (debug >= 1)
+ System.out.println("INPD: " + inContent);
OutputStream os = conn.getOutputStream();
for (int i = 0; i < inContent.length(); i++)
os.write(inContent.charAt(i));
@@ -426,6 +468,8 @@
if (debug >= 1)
System.out.println("HEAD: " + name + ": " + value);
save(name, value);
+ if ("Set-Cookie".equals(name))
+ parseSession(value);
}
if (debug >= 1) {
System.out.println("DATA: " + outData);
@@ -528,11 +572,19 @@
pw.print(command + "\r\n");
if (inContent != null) {
if (debug >= 1)
- System.out.println("HEAD: " + "Content-Length: " +
+ System.out.println("INPH: " + "Content-Length: " +
inContent.length());
pw.print("Content-Length: " + inContent.length() + "\r\n");
}
+ // Send the session id cookie (if any)
+ if (joinSession && (sessionId != null)) {
+ pw.println("Cookie: JSESSIONID=" + sessionId);
+ if (debug >= 1)
+ System.out.println("INPH: Cookie: JSESSIONID=" +
+ sessionId);
+ }
+
// Send the specified headers (if any)
if (inHeaders != null) {
String headers = inHeaders;
@@ -552,7 +604,7 @@
String name = header.substring(0, colon).trim();
String value = header.substring(colon + 1).trim();
if (debug >= 1)
- System.out.println("HEAD: " + name + ": " + value);
+ System.out.println("INPH: " + name + ": " + value);
pw.print(name + ": " + value + "\r\n");
}
}
@@ -561,12 +613,9 @@
// Send our content (if any)
if (inContent != null) {
if (debug >= 1)
- System.out.print("DATA: ");
- for (int i = 0; i < inContent.length(); i++) {
- if (debug >= 1)
- System.out.print(inContent.charAt(i));
+ System.out.println("INPD: " + inContent);
+ for (int i = 0; i < inContent.length(); i++)
pw.print(inContent.charAt(i));
- }
}
pw.flush();
@@ -619,6 +668,8 @@
System.out.println("HEAD: " + headerName + ": " +
headerValue);
save(headerName, headerValue);
+ if ("Set-Cookie".equals(headerName))
+ parseSession(headerValue);
}
}
@@ -711,6 +762,30 @@
if (throwable != null)
throwable.printStackTrace(System.out);
}
+
+ }
+
+
+ /**
+ * Parse the session identifier from the specified Set-Cookie value.
+ *
+ * @param value The Set-Cookie value to parse
+ */
+ protected void parseSession(String value) {
+
+ if (value == null)
+ return;
+ int equals = value.indexOf("JSESSIONID=");
+ if (equals < 0)
+ return;
+ value = value.substring(equals + "JSESSIONID=".length());
+ int semi = value.indexOf(";");
+ if (semi >= 0)
+ value = value.substring(0, semi);
+
+ if (debug >= 1)
+ System.out.println("SESSION ID: " + value);
+ sessionId = value;
}
No revision
No revision
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Aggregate01.java
Index: Aggregate01.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Aggregate01.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Aggregate01.java 2001/01/27 01:49:14 1.1
+++ Aggregate01.java 2001/03/15 03:24:07 1.1.2.1
@@ -71,7 +71,7 @@
* values returned by request.getParameterValues().
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/01/27 01:49:14 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:07 $
*/
public class Aggregate01 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Aggregate02.java
Index: Aggregate02.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Aggregate02.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Aggregate02.java 2001/01/27 01:49:14 1.1
+++ Aggregate02.java 2001/03/15 03:24:07 1.1.2.1
@@ -76,7 +76,7 @@
* <code>getParameterMap()</code> method to retrieve parameter values.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/01/27 01:49:14 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:07 $
*/
public class Aggregate02 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage01.java
Index: ErrorPage01.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage01.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ErrorPage01.java 2001/02/21 21:39:51 1.1
+++ ErrorPage01.java 2001/03/15 03:24:07 1.1.2.1
@@ -68,7 +68,7 @@
* ErrorPage02 servlet in the deployment descriptor.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/21 21:39:51 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:07 $
*/
public class ErrorPage01 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage02.java
Index: ErrorPage02.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage02.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ErrorPage02.java 2001/02/21 21:39:51 1.1
+++ ErrorPage02.java 2001/03/15 03:24:07 1.1.2.1
@@ -67,7 +67,7 @@
* the ErrorPage01 servlet returns the appropriate status code.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/21 21:39:51 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:07 $
*/
public class ErrorPage02 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage03.java
Index: ErrorPage03.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage03.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ErrorPage03.java 2001/02/21 21:39:51 1.1
+++ ErrorPage03.java 2001/03/15 03:24:07 1.1.2.1
@@ -68,7 +68,7 @@
* is mapped to the ErrorPage04 servlet in the deployment descriptor.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/21 21:39:51 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:07 $
*/
public class ErrorPage03 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage04.java
Index: ErrorPage04.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage04.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ErrorPage04.java 2001/02/21 21:39:51 1.1
+++ ErrorPage04.java 2001/03/15 03:24:08 1.1.2.1
@@ -67,7 +67,7 @@
* the ErrorPage01 servlet returns the appropriate exception.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/21 21:39:51 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:08 $
*/
public class ErrorPage04 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include02.java
Index: Include02.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include02.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Include02.java 2001/02/06 17:16:23 1.1
+++ Include02.java 2001/03/15 03:24:08 1.1.2.1
@@ -71,7 +71,7 @@
* these types should be propogated back to the caller unchanged.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/06 17:16:23 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:08 $
*/
public class Include02 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include02a.java
Index: Include02a.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include02a.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Include02a.java 2001/02/06 17:16:24 1.1
+++ Include02a.java 2001/03/15 03:24:08 1.1.2.1
@@ -66,7 +66,7 @@
* Included servlet for the test performed by Include02.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/06 17:16:24 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:08 $
*/
public class Include02a extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi01.java
Index: Jndi01.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi01.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Jndi01.java 2001/02/22 01:07:26 1.1
+++ Jndi01.java 2001/03/15 03:24:08 1.1.2.1
@@ -74,7 +74,7 @@
* should succeed.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/22 01:07:26 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:08 $
*/
public class Jndi01 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi02.java
Index: Jndi02.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi02.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Jndi02.java 2001/02/22 01:07:26 1.1
+++ Jndi02.java 2001/03/15 03:24:08 1.1.2.1
@@ -75,7 +75,7 @@
* deployment descriptor.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/22 01:07:26 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:08 $
*/
public class Jndi02 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Resources01.java
Index: Resources01.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Resources01.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Resources01.java 2001/01/23 20:12:08 1.1
+++ Resources01.java 2001/03/15 03:24:08 1.1.2.1
@@ -77,7 +77,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/01/23 20:12:08 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:08 $
*/
public class Resources01 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Resources02.java
Index: Resources02.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Resources02.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Resources02.java 2001/01/23 20:12:10 1.1
+++ Resources02.java 2001/03/15 03:24:08 1.1.2.1
@@ -77,7 +77,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/01/23 20:12:10 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:08 $
*/
public class Resources02 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Resources03.java
Index: Resources03.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Resources03.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Resources03.java 2001/01/23 20:12:11 1.1
+++ Resources03.java 2001/03/15 03:24:09 1.1.2.1
@@ -77,7 +77,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/01/23 20:12:11 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:09 $
*/
public class Resources03 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Resources04.java
Index: Resources04.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Resources04.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Resources04.java 2001/01/23 20:12:12 1.1
+++ Resources04.java 2001/03/15 03:24:09 1.1.2.1
@@ -77,7 +77,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/01/23 20:12:12 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:09 $
*/
public class Resources04 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session01.java
Index: Session01.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session01.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Session01.java 2001/02/04 04:49:38 1.1
+++ Session01.java 2001/03/15 03:24:09 1.1.2.1
@@ -67,7 +67,7 @@
* creates a new session and sets a session attribute.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/04 04:49:38 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:09 $
*/
public class Session01 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session02.java
Index: Session02.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session02.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Session02.java 2001/02/04 04:49:38 1.1
+++ Session02.java 2001/03/15 03:24:09 1.1.2.1
@@ -67,7 +67,7 @@
* that the session bean stashed in Part 1 can be retrieved successfully.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/04 04:49:38 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:09 $
*/
public class Session02 extends HttpServlet {
1.2.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session03.java
Index: Session03.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session03.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Session03.java 2001/02/06 17:16:24 1.2
+++ Session03.java 2001/03/15 03:24:09 1.2.2.1
@@ -68,7 +68,7 @@
* Then, it removes that attribute and verifies successful removal.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/02/06 17:16:24 $
+ * @version $Revision: 1.2.2.1 $ $Date: 2001/03/15 03:24:09 $
*/
public class Session03 extends HttpServlet {
1.2.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionBean.java
Index: SessionBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionBean.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SessionBean.java 2001/02/06 17:16:24 1.2
+++ SessionBean.java 2001/03/15 03:24:09 1.2.2.1
@@ -70,7 +70,7 @@
* so that instances can be saved and restored across server restarts.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/02/06 17:16:24 $
+ * @version $Revision: 1.2.2.1 $ $Date: 2001/03/15 03:24:09 $
*/
public class SessionBean implements
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TesterException.java
Index: TesterException.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TesterException.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- TesterException.java 2001/02/21 21:39:51 1.1
+++ TesterException.java 2001/03/15 03:24:10 1.1.2.1
@@ -66,7 +66,7 @@
* Generic exception class to use for testing error page assertions.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/02/21 21:39:51 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:10 $
*/
public class TesterException extends Exception {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Xerces01.java
Index: Xerces01.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Xerces01.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Xerces01.java 2001/03/13 19:06:17 1.1
+++ Xerces01.java 2001/03/15 03:24:10 1.1.2.1
@@ -73,7 +73,7 @@
*
* @author Amy Roh
* @author Craig McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/03/13 19:06:17 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:10 $
*/
public class Xerces01 extends HttpServlet {
1.1.2.1 +1 -1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Xerces01Parser.java
Index: Xerces01Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Xerces01Parser.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Xerces01Parser.java 2001/03/13 19:06:18 1.1
+++ Xerces01Parser.java 2001/03/15 03:24:10 1.1.2.1
@@ -74,7 +74,7 @@
*
* @author Amy Roh
* @author Craig McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/03/13 19:06:18 $
+ * @version $Revision: 1.1.2.1 $ $Date: 2001/03/15 03:24:10 $
*/
public class Xerces01Parser extends HandlerBase {
No revision
No revision
1.6.2.1 +394 -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.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- web.xml 2001/01/06 02:38:13 1.6
+++ web.xml 2001/03/15 03:24:13 1.6.2.1
@@ -42,6 +42,36 @@
<filter-mapping>
<filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedAggregate01</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedAggregate02</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedErrorPage01</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedErrorPage02</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedErrorPage03</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedErrorPage04</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
<url-pattern>/WrappedForward01</url-pattern>
</filter-mapping>
@@ -76,11 +106,61 @@
</filter-mapping>
<filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedInclude02</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedJndi01</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedJndi02</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>GenericFilter</filter-name>
<url-pattern>/WrappedReset01</url-pattern>
</filter-mapping>
<filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedResources01</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedResources02</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedResources03</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedResources04</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedSession01</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedSession02</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedSession03</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>GenericFilter</filter-name>
<url-pattern>/WrappedSetBufferSize01</url-pattern>
</filter-mapping>
@@ -94,6 +174,16 @@
<!-- ========== Servlet Definitions =================================== -->
<servlet>
+ <servlet-name>Aggregate01</servlet-name>
+ <servlet-class>org.apache.tester.Aggregate01</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Aggregate02</servlet-name>
+ <servlet-class>org.apache.tester.Aggregate02</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>Authentication01</servlet-name>
<servlet-class>org.apache.tester.Authentication01</servlet-class>
</servlet>
@@ -104,6 +194,26 @@
</servlet>
<servlet>
+ <servlet-name>ErrorPage01</servlet-name>
+ <servlet-class>org.apache.tester.ErrorPage01</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ErrorPage02</servlet-name>
+ <servlet-class>org.apache.tester.ErrorPage02</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ErrorPage03</servlet-name>
+ <servlet-class>org.apache.tester.ErrorPage03</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ErrorPage04</servlet-name>
+ <servlet-class>org.apache.tester.ErrorPage04</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>Forward01</servlet-name>
<servlet-class>org.apache.tester.Forward01</servlet-class>
</servlet>
@@ -139,11 +249,66 @@
</servlet>
<servlet>
+ <servlet-name>Include02</servlet-name>
+ <servlet-class>org.apache.tester.Include02</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Include02a</servlet-name>
+ <servlet-class>org.apache.tester.Include02a</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Jndi01</servlet-name>
+ <servlet-class>org.apache.tester.Jndi01</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Jndi02</servlet-name>
+ <servlet-class>org.apache.tester.Jndi02</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>Reset01</servlet-name>
<servlet-class>org.apache.tester.Reset01</servlet-class>
</servlet>
<servlet>
+ <servlet-name>Resources01</servlet-name>
+ <servlet-class>org.apache.tester.Resources01</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Resources02</servlet-name>
+ <servlet-class>org.apache.tester.Resources02</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Resources03</servlet-name>
+ <servlet-class>org.apache.tester.Resources03</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Resources04</servlet-name>
+ <servlet-class>org.apache.tester.Resources04</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Session01</servlet-name>
+ <servlet-class>org.apache.tester.Session01</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Session02</servlet-name>
+ <servlet-class>org.apache.tester.Session02</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Session03</servlet-name>
+ <servlet-class>org.apache.tester.Session03</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>SetBufferSize01</servlet-name>
<servlet-class>org.apache.tester.SetBufferSize01</servlet-class>
</servlet>
@@ -153,9 +318,30 @@
<servlet-class>org.apache.tester.SetLocale01</servlet-class>
</servlet>
+
<!-- ========== Servlet Mappings ====================================== -->
<servlet-mapping>
+ <servlet-name>Aggregate01</servlet-name>
+ <url-pattern>/Aggregate01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Aggregate01</servlet-name>
+ <url-pattern>/WrappedAggregate01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Aggregate02</servlet-name>
+ <url-pattern>/Aggregate02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Aggregate02</servlet-name>
+ <url-pattern>/WrappedAggregate02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>Authentication01</servlet-name>
<url-pattern>/protected/Authentication01</url-pattern>
</servlet-mapping>
@@ -166,6 +352,46 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>ErrorPage01</servlet-name>
+ <url-pattern>/ErrorPage01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage01</servlet-name>
+ <url-pattern>/WrappedErrorPage01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage02</servlet-name>
+ <url-pattern>/ErrorPage02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage02</servlet-name>
+ <url-pattern>/WrappedErrorPage02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage03</servlet-name>
+ <url-pattern>/ErrorPage03</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage03</servlet-name>
+ <url-pattern>/WrappedErrorPage03</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage04</servlet-name>
+ <url-pattern>/ErrorPage04</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage04</servlet-name>
+ <url-pattern>/WrappedErrorPage04</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>Forward01</servlet-name>
<url-pattern>/Forward01</url-pattern>
</servlet-mapping>
@@ -241,6 +467,46 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>Include02</servlet-name>
+ <url-pattern>/Include02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Include02</servlet-name>
+ <url-pattern>/WrappedInclude02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Include02a</servlet-name>
+ <url-pattern>/Include02a</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Include02a</servlet-name>
+ <url-pattern>/WrappedInclude02a</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Jndi01</servlet-name>
+ <url-pattern>/Jndi01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Jndi01</servlet-name>
+ <url-pattern>/WrappedJndi01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Jndi02</servlet-name>
+ <url-pattern>/Jndi02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Jndi02</servlet-name>
+ <url-pattern>/WrappedJndi02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>Reset01</servlet-name>
<url-pattern>/Reset01</url-pattern>
</servlet-mapping>
@@ -251,6 +517,76 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>Resources01</servlet-name>
+ <url-pattern>/Resources01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Resources01</servlet-name>
+ <url-pattern>/WrappedResources01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Resources02</servlet-name>
+ <url-pattern>/Resources02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Resources02</servlet-name>
+ <url-pattern>/WrappedResources02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Resources03</servlet-name>
+ <url-pattern>/Resources03</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Resources03</servlet-name>
+ <url-pattern>/WrappedResources03</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Resources04</servlet-name>
+ <url-pattern>/Resources04</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Resources04</servlet-name>
+ <url-pattern>/WrappedResources04</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session01</servlet-name>
+ <url-pattern>/Session01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session01</servlet-name>
+ <url-pattern>/WrappedSession01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session02</servlet-name>
+ <url-pattern>/Session02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session02</servlet-name>
+ <url-pattern>/WrappedSession02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session03</servlet-name>
+ <url-pattern>/Session03</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session03</servlet-name>
+ <url-pattern>/WrappedSession03</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>SetBufferSize01</servlet-name>
<url-pattern>/SetBufferSize01</url-pattern>
</servlet-mapping>
@@ -271,6 +607,19 @@
</servlet-mapping>
+ <!-- ========== Error Page Mappings =================================== -->
+
+ <error-page>
+ <error-code>412</error-code> <!-- SC_PRECONDITION_FAILED -->
+ <location>/ErrorPage02</location>
+ </error-page>
+
+ <error-page>
+ <exception-type>org.apache.tester.TesterException</exception-type>
+ <location>/ErrorPage04</location>
+ </error-page>
+
+
<!-- ========== Security Constraints ================================== -->
<security-constraint>
@@ -287,6 +636,51 @@
<auth-method>BASIC</auth-method>
<realm-name>Authentication Servlet</realm-name>
</login-config>
+
+
+ <!-- ========== Environment Entries =================================== -->
+
+ <env-entry>
+ <env-entry-name>booleanEntry</env-entry-name>
+ <env-entry-value>true</env-entry-value>
+ <env-entry-type>java.lang.Boolean</env-entry-type>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>byteEntry</env-entry-name>
+ <env-entry-value>123</env-entry-value>
+ <env-entry-type>java.lang.Byte</env-entry-type>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>doubleEntry</env-entry-name>
+ <env-entry-value>123.45</env-entry-value>
+ <env-entry-type>java.lang.Double</env-entry-type>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>floatEntry</env-entry-name>
+ <env-entry-value>54.32</env-entry-value>
+ <env-entry-type>java.lang.Float</env-entry-type>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>integerEntry</env-entry-name>
+ <env-entry-value>12345</env-entry-value>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>longEntry</env-entry-name>
+ <env-entry-value>54321</env-entry-value>
+ <env-entry-type>java.lang.Long</env-entry-type>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>stringEntry</env-entry-name>
+ <env-entry-value>String Value</env-entry-value>
+ <env-entry-type>java.lang.String</env-entry-type>
+ </env-entry>
</web-app>
