sigh/
On Tuesday 10 September 2002 10:56 pm, Steve Downey wrote:
This patch builds tester against the servletapi-5 classes and repairs the
URLs in the JSP examples used by tester. These were causing some false
positve and false negative test results.
Index: build.xml
===
RCS file: /home/cvspublic/jakarta-tomcat-catalina/tester/build.xml,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 build.xml
--- build.xml 18 Jul 2002 16:47:24 - 1.1.1.1
+++ build.xml 11 Sep 2002 02:54:01 -
@@ -8,14 +8,14 @@
property file=${user.home}/build.properties/
property name=build.compiler value=classic/
- property name=servletapi.home value=../../jakarta-servletapi-4/dist/
+ property name=api.home value=../../jakarta-servletapi-5/dist/
property name=tester.buildvalue=${basedir}/build/
property name=tester.deploy value=${basedir}/../build/
property name=tester.dist value=${basedir}/dist/
!-- == Derived Property Values = --
property name=ant.jar value=${ant.home}/lib/ant.jar/
- property name=servlet.jar value=${servletapi.home}/lib/servlet.jar/
+ property name=servlet-api.jar value=${api.home}/jsr154/dist/lib/servlet-api.jar/
!-- === BUILD: Create Directories == --
target name=build-prepare
@@ -56,7 +56,7 @@
!-- Compile tester components and tools --
javac srcdir=src/tester destdir=${tester.build}/classes
- classpath=${ant.jar}:${servlet.jar}:${xerces.jar}
+ classpath=${ant.jar}:${servlet-api.jar}:${xercesImpl.jar}
deprecation=off debug=on optimize=off
excludes=**/CVS/**/
@@ -87,7 +87,7 @@
tofile=${tester.build}/web/WEB-INF/classes/org/apache/tester/Unpacked05.txt/
!-- Install Xerces --
-copy todir=${tester.build}/web/WEB-INF/lib file=${xerces.jar}/
+copy todir=${tester.build}/web/WEB-INF/lib file=${xercesImpl.jar}/
!-- Create and install tester library --
mkdir dir=${tester.build}/web/WEB-INF/lib/
Index: src/bin/tester.xml
===
RCS file: /home/cvspublic/jakarta-tomcat-catalina/tester/src/bin/tester.xml,v
retrieving revision 1.2
diff -u -w -r1.2 tester.xml
--- src/bin/tester.xml 9 Aug 2002 02:12:13 - 1.2
+++ src/bin/tester.xml 11 Sep 2002 02:54:01 -
@@ -8,11 +8,15 @@
!-- property name=protocol value=HTTP/1.0/ --
property name=protocol value=/ !-- Use HttpURLConnection --
property name=context.path value=/tester/
- property name=examples.path value=/examples/
+ property name=examples.path value=/jsp-examples/
property name=golden.pathvalue=${context.path}/golden/
property name=manager.path value=/manager/
property name=reload.pathvalue=/tester/
- taskdef name=tester classname=org.apache.tester.TestClient/
+ taskdef name=tester classname=org.apache.tester.TestClient
+classpath
+ pathelement location=${catalina.home}/webapps/tester/WEB-INF/lib/tester.jar/
+/classpath
+ /taskdef
target name=all depends=ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,FilterRequest,FilterResponse,Jndi,Jsp,Lifecycle,RequestDispatcher,Resources,Security,ServletContext,ServletRequest,ServletResponse,HttpSession,XercesTest/
@@ -110,33 +114,23 @@
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.path}/jsp/dates/date.jsp debug=${debug}
+ request=${examples.path}/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.path}/jsp/dates/date.Jsp debug=${debug}
+ request=${examples.path}/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.path}/jsp/dates/Date.jsp debug=${debug}
+ request=${examples.path}/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.path}/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}
-
