remm 2003/07/20 07:53:04
Modified: tester build.xml
tester/src/bin tester.xml
Added: tester/src/conf tomcat-users.xml
Log:
- Fix most remaining tester failures.
Revision Changes Path
1.4 +8 -0 jakarta-tomcat-catalina/tester/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 19 Jul 2003 20:21:12 -0000 1.3
+++ build.xml 20 Jul 2003 14:53:04 -0000 1.4
@@ -22,6 +22,7 @@
<mkdir dir="${tester.build}"/>
<mkdir dir="${tester.build}/bin"/>
<mkdir dir="${tester.build}/classes"/>
+ <mkdir dir="${tester.build}/conf"/>
<mkdir dir="${tester.build}/lib"/>
</target>
@@ -37,6 +38,9 @@
<fixcrlf srcdir="${tester.build}/bin" includes="*.sh" eol="lf"/>
<fixcrlf srcdir="${tester.build}/bin" includes="*.bat" eol="crlf"/>
<chmod perm="+x" file="${tester.build}/bin/tester.sh"/>
+ <copy todir="${tester.build}/conf">
+ <fileset dir="src/conf" />
+ </copy>
<!-- Compiled Classes -->
<mkdir dir="${tester.build}/classes"/>
@@ -133,6 +137,7 @@
<target name="deploy-prepare">
<mkdir dir="${tester.deploy}"/>
<mkdir dir="${tester.deploy}/bin"/>
+ <mkdir dir="${tester.deploy}/conf"/>
</target>
@@ -146,6 +151,9 @@
<fixcrlf srcdir="${tester.deploy}/bin" includes="*.sh" eol="lf"/>
<fixcrlf srcdir="${tester.deploy}/bin" includes="*.bat" eol="crlf"/>
<chmod perm="+x" file="${tester.deploy}/bin/tester.sh"/>
+ <copy todir="${tester.deploy}/conf" overwrite="true">
+ <fileset dir="${tester.build}/conf" />
+ </copy>
<!-- Unpacked Shared Classes -->
<mkdir dir="${tester.deploy}/shared/classes"/>
1.6 +10 -9 jakarta-tomcat-catalina/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/src/bin/tester.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tester.xml 19 Jul 2003 20:21:12 -0000 1.5
+++ tester.xml 20 Jul 2003 14:53:04 -0000 1.6
@@ -22,7 +22,6 @@
<target name="all"
depends="ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,FilterRequest,FilterResponse,Jndi,Jsp,Lifecycle,RequestDispatcher,Resources,Security,ServletContext,ServletRequest,ServletResponse,HttpSession,XercesTest"/>
-
<target name="ROOT">
<!-- ========== Basic Run State ======================================= -->
@@ -221,10 +220,12 @@
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/ErrorPage03" debug="${debug}"
+ status="500"
outContent="ErrorPage04 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedErrorPage03" debug="${debug}"
+ status="500"
outContent="ErrorPage04 PASSED"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
@@ -269,12 +270,12 @@
<tester host="${host}" port="${port}" protocol="HTTP/1.0"
request="${context.path}/ErrorPage07"
debug="${debug}"
- status="503"/>
+ status="404"/>
<tester host="${host}" port="${port}" protocol="HTTP/1.0"
request="${context.path}/WrappedErrorPage07"
debug="${debug}"
- status="503"/>
+ status="404"/>
<!-- ========== Exception Mapping (JSP Source) ======================== -->
@@ -293,25 +294,25 @@
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/ErrorPage08?type=Array"
debug="${debug}"
- status="200"
+ status="500"
outContent="ErrorPage06 PASSED - JSP"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedErrorPage08?type=Array"
debug="${debug}"
- status="200"
+ status="500"
outContent="ErrorPage06 PASSED - JSP"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/ErrorPage08?type=Number"
debug="${debug}"
- status="200"
+ status="500"
outContent="ErrorPage06 PASSED - HTML"/>
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedErrorPage08?type=Number"
debug="${debug}"
- status="200"
+ status="500"
outContent="ErrorPage06 PASSED - HTML"/>
<!-- ========== Exception Mapping (JSP Error Page) ==================== -->
@@ -651,7 +652,7 @@
<tester host="${host}" port="${port}" protocol="HTTP/1.0"
request="${context.path}/Lifecycle03?step=1" debug="${debug}"
- status="503"/>
+ status="404"/>
<!-- NOTE - cannot do this as originally intended, because the
servlet was marked as permanently unavailable, so just
@@ -664,7 +665,7 @@
<tester host="${host}" port="${port}" protocol="HTTP/1.0"
request="${context.path}/Lifecycle03?step=2" debug="${debug}"
- status="503"/>
+ status="404"/>
</target>
1.1 jakarta-tomcat-catalina/tester/src/conf/tomcat-users.xml
Index: tomcat-users.xml
===================================================================
<?xml version='1.0' encoding='utf-8'?>
<tomcat-users>
<role rolename="tomcat"/>
<role rolename="role1"/>
<user username="tomcat" password="tomcat" roles="tomcat,admin,manager"/>
<user username="role1" password="tomcat" roles="role1"/>
<user username="both" password="tomcat" roles="tomcat,role1"/>
</tomcat-users>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
