Return-Path: Mailing-List: contact watchdog-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list watchdog-dev@jakarta.apache.org Received: (qmail 96834 invoked by uid 500); 1 May 2000 19:36:22 -0000 Delivered-To: apmail-jakarta-watchdog-cvs@apache.org Received: (qmail 96831 invoked by uid 1059); 1 May 2000 19:36:21 -0000 Date: 1 May 2000 19:36:21 -0000 Message-ID: <20000501193621.96830.qmail@locus.apache.org> From: craigmcc@locus.apache.org To: jakarta-watchdog-cvs@apache.org Subject: cvs commit: jakarta-watchdog/src/conf jsp-gtest.xml jsp-moo.xml servlet-gtest.xml servlet-moo.xml craigmcc 00/05/01 12:36:21 Modified: . README build.bat build.sh build.xml src/bin watchdog.bat watchdog.sh src/conf jsp-gtest.xml jsp-moo.xml servlet-gtest.xml servlet-moo.xml Log: Update the build and execution scripts (and the README file) to reflect the changes in Ant that removed the "xml.jar" file. Revision Changes Path 1.12 +102 -113 jakarta-watchdog/README Index: README =================================================================== RCS file: /home/cvs/jakarta-watchdog/README,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- README 2000/03/06 23:36:14 1.11 +++ README 2000/05/01 19:36:18 1.12 @@ -1,150 +1,139 @@ + Watchdog Compatibility Test Suite + ================================= -PROJECT jakarta-watchdog SOURCE TREE -==================================== - -This is the source code tree for jakarta-watchdog(Jcheck) which is a -set of API validation tests for the Servlet 2.2 APIs and the JSP -1.1 APIs. -How to Build ------------- +This subproject contains the source code for the Watchdog compatibility test +suite (CTS), which tests servlet containers for compliance with the Java +Servlet API Specification (version 2.2) and the JavaServer Pages Specification +(version 1.1). -There are 2 compilation scripts provided, a ksh based script for -Unix and a .bat based DOS build script. Essentially these scripts are -wrappers that put the ant.jar file on the classpath and calls: - java org.apache.tools.ant.Main +Installing and Building Watchdog +================================ -To build, execute the either of the following commands in this -directory: +In order to successfully build the Watchdog CTS, you will need to do the +following. In the instructions below, $JAKARTA_HOME is assumed to be the +directory into which you are installing all of the required distributions. - (unix)% ./build.sh - (dos)> .\build.bat +* Download and install a version 1.1 or later Java Development Kit + implementation for your operating system platform. Set a "JAVA_HOME" + environment variable to point at the directory where your JDK is installed, + and add "$JAVA_HOME/bin" to your PATH. Configure the CLASSPATH environment + variable as well, if required. -This will build tests into a build directory located in this directory. +* Download and install the Java API for XML Parsing implementation (current + version number is 1.0) from . Make sure that the + "jaxp.jar" and "parser.jar" files are on your class path. (NOTE: In the + future it will be possible to use any JAXP-compliant parser). -Windows Note: If you get an "Out of Environment Space" message, you -need to clean-up the initial environment of your command prompt window. +* Download and install the Ant distribution (subproject "jakarta-ant") into + a directory named "$JAKARTA_HOME/jakarta-ant". If you have downloaded the + source distribution, you will need to build the executable version by + executing the following commands: -To build a 'distribution' build (with all the classes jarrd up), execute: + cd $JAKARTA_HOME/jakarta-ant + ./bootstrap.sh <-- Unix + bootstrap <-- Windows - (unix)% ./build.sh dist - (dos)> \build.bat dist + This should result in the creation of a file "ant.jar" in the "lib" + subdirectory, which will be used when building Watchdog. -To clean out the build and dist (removes the build/watchdog and dist/watchdog -dirs): +* Download and install the Servletapi distribution (subproject + "jakarta-servletapi") into a subdirectory named + "$JAKARTA_HOME/jakarta-servletapi". If you have downloaded the source + distribution, you will need to build the executable version by + executing the following commands: - (unix)% ./build.sh clean - (dos)> .\build.bat clean + cd $JAKARTA_HOME/jakarta-servletapi + ./build.sh dist <-- Unix + build dist <-- Windows -NOTE: To build Jcheck you will need "servlet-2.2.0.jar" in your CLASSPATH. - It has all the Servlet 2.2 and JSP 1.1 public APIs. It can be found - in the jakarta-tools workspace. - Ofcourse, you will need a correct version of JDK (and tools.jar - for JDK 1.2) as well. + This should result in the creation of a file "servlet.jar" in the "lib" + subdirectory, which will be used when building Watchdog. -Running the Build ------------------ +* Optionally, you can download and install Tomcat to practice running + Watchdog tests against (the instructions below illustrate how). + To do this, download and install the Tomcat distribution (subproject + "jakarta-tomcat") into a subdirectory named "$JAKARTA_HOME/jakarta-tomcat". + If you have downloaded the source distribution, you will need to build the + executable version by executing the following commands: - Jakarta - | - / \ - / | \ - / | \ - / | \ - / | \ - / / \ \ - / / \ \ - jakarta-tomcat build dist jakarta-watchdog - | - / \ - / \ - tomcat watchdog - | | - webapps webapps + cd $JAKARTA_HOME/jakarta-tomcat + ./build.sh dist <-- Unix + build dist <-- Windows + This will result in a binary distribution version of Tomcat being + built in directory "$JAKARTA_HOME/dist/tomcat", which can be used + to practice executing the Watchdog tests, as described below. -Tests can be run in two different ways: +* Download and install the Watchdog source distribution (subproject + "jakarta-watchdog") into a subdirectory named + "$JAKARTA_HOME/jakarta-watchdog". To build the executable version + of Watchdog, execute the following commands: -1) Running tests against the tomcat server: + cd $JAKARTA_HOME/jakarta-watchdog + ./build.sh dist <-- Unix + build dist <-- Windows - - Deploy the servlet and jsp test on the tomcat server by copying - jsp-tests.war and - servlet-tests.war - from - dist/watchdog/webapps - to - dist/tomcat/webapps + This will result in a binary distribution version of Watchdog being + built in directory "$JAKARTA_HOME/dist/watchdog", which can be used + to execute the tests against your servlet container as described below. - - Start tomcat server - (unix)% cd dist/tomcat/bin - (unix)% ./startup.sh - (dos)> cd dist\tomcat\bin - (dos)> .\startup.bat - - - Running Servlet tests +Running the Watchdog CTS +======================== - (unix)% ./build.sh - (unix)% cd ../dist/watchdog/bin - (unix)% ./watchdog.sh servlet +The Watchdog tests are executed by deploying two web applications (one for +servlet tests and one for JSP tests) into your servlet container, and then +executing an appropriate shell script. The illustrations below assume that +you are running the tests against Tomcat -- make the appropriate changes in +procedures to test your own container. The steps are as follows: - (dos)> .\build.bat - (dos)> cd ..\dist\watchdog\bin - (dos)> .\watchdog.bat servlet +* Deploy the two web applications into your servlet container. If you have + downloaded and built the Tomcat source distribution, you would do this: - - Running JSP tests + cd $JAKARTA_HOME/dist/watchdog/webapps + cp *.war ../../tomcat/webapps - (unix)% ./build.sh - (unix)% cd ../dist/watchdog - (unix)% ./watchdog.sh jsp +* Start your servlet container. If you have downloaded and built the Tomcat + source distribution, you would do this: - (dos)> .\build.bat - (dos)> cd ..\dist\watchdog - (dos)> .\watchdog.bat jsp + cd $JAKARTA_HOME/dist/tomcat + bin/startup.sh <-- Unix + bin\startup <-- Windows -2) Running test against other servers: +* Execute the servlet test suite. The default scripts assume you are running + against a servlet container at http://localhost:8080 with the test suite + deployed, but the server name and port can be added as arguments. - - Running Servlet tests. + cd $JAKARTA_HOME/dist/watchdog/bin + ./watchdog.sh servet [hostname] [port] <-- Unix + watchdog servlet [hostname] [port] <-- Windows - The server-side web-application is in - dist/watchdog/webapps/servlet-tests.war +* Execute the JSP test suite. The default scripts assume you are running + against a servlet container at http://localhost:8080 with the test suite + deployed, but the server name and port can be added as arguments. - Deploy this war file on the server you want to test. Then + cd $JAKARTA_HOME/dist/watchdog/bin + ./watchdog.sh jsp [hostname] [port] <-- Unix + watchdog jsp [hostname] [port] <-- Windows - (unix)% ./build.sh - (unix)% cd ../dist/watchdog/bin - (unix)% ./watchdog.sh servlet {host} {port} +* If you modify the tests and wish to re-execute them, be sure to restart + your servlet container and redeploy the tests (rerunning the tests without + a restart will cause some tests to fail). For Tomcat, you will need to + delete the "expanded" versions of the two web applications in order for + the new war files to be deployed, as follows: - (dos)> .\build.bat - (dos)> cd ..\dist\watchdog\bin - (dos)> .\watchdog.bat servlet {host} {port} + cd $JAKARTA_HOME/dist/tomcat/webapps + rm -rf jsp-tests + rm -rf servlet-tests - - Running JSP tests. - The server-side web-application is in - dist/watchdog/webapps/jsp-tests.war +Before Committing Changes +========================= - Install this war file on the server you want to test. Then +Before committing any changes to the Watchdog CVS repository, you MUST do a +"build clean" followed by a "build dist" to ensure that the build process runs +cleanly, and you must ensure that the tests run correctly. - (unix)% ./build.sh - (unix)% cd ../dist/watchdog/bin - (unix)% ./watchdog.sh jsp {host} {port} - (dos)> .\build.bat - (dos)> cd ..\dist\watchdog\bin - (dos)> .\watchdog.bat jsp {host} {port} - - -BEFORE COMMITTING CHANGES -------------------------- - -You must, MUST do a `build clean;build` to make sure a clean -workspace builds. Also, you must, MUST run the tests. All tests must -pass before checking in the code. - -Related Documents ------------------ - -Please read doc/design for further information on the Watchdog design overview. -For details on Ant, refer to http://jakarta.apache.org/ant/index.html 1.5 +3 -3 jakarta-watchdog/build.bat Index: build.bat =================================================================== RCS file: /home/cvs/jakarta-watchdog/build.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.bat 2000/01/15 12:17:14 1.4 +++ build.bat 2000/05/01 19:36:18 1.5 @@ -1,5 +1,5 @@ @echo off -rem $Id: build.bat,v 1.4 2000/01/15 12:17:14 rubys Exp $ +rem $Id: build.bat,v 1.5 2000/05/01 19:36:18 craigmcc Exp $ rem Build file for stoopid dos machines SET _ANTHOME=%ANT_HOME% @@ -9,12 +9,12 @@ rem else set _CLASSPATH=%CLASSPATH% -set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\servlet-2.2.0.jar +set CLASSPATH=%CLASSPATH%;%ANT_HOME%\lib\ant.jar goto next :noclasspath set _CLASSPATH= -set CLASSPATH=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;..\jakarta-tools\servlet-2.2.0.jar +set CLASSPATH=%ANT_HOME%\lib\ant.jar goto next :next 1.8 +2 -2 jakarta-watchdog/build.sh Index: build.sh =================================================================== RCS file: /home/cvs/jakarta-watchdog/build.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.sh 2000/01/15 12:17:14 1.7 +++ build.sh 2000/05/01 19:36:18 1.8 @@ -1,13 +1,13 @@ #!/bin/sh # -# $Id: build.sh,v 1.7 2000/01/15 12:17:14 rubys Exp $ +# $Id: build.sh,v 1.8 2000/05/01 19:36:18 craigmcc Exp $ # Ksh wrapper around ant build system. baseDir=`pwd` echo $baseDir ..... -ADDL_CLASSPATH=../jakarta-ant/lib/ant.jar:../jakarta-ant/lib/xml.jar:../jakarta-tools/servlet-2.2.0.jar +ADDL_CLASSPATH=../jakarta-ant/lib/ant.jar if [ -n $CLASSPATH ]; then CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH 1.33 +46 -39 jakarta-watchdog/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-watchdog/build.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- build.xml 2000/04/01 16:20:19 1.32 +++ build.xml 2000/05/01 19:36:18 1.33 @@ -1,17 +1,13 @@ - - + - - + + + + - - - - - + @@ -25,37 +21,43 @@ - - - + + + + + - - - + - - + + - + + dest="${watchdog.build}/doc/Readme"/> + dest="${watchdog.build}/webapps/servlet-tests/WEB-INF/lib/moo.jar"/> + dest="${watchdog.build}/webapps/jsp-tests/WEB-INF/lib/moo.jar"/> - + + + + + + @@ -100,29 +104,29 @@ - + + dest="${watchdog.dist}/doc/Readme"/> + dest="${watchdog.dist}/lib/moo.jar"/> + dest="${watchdog.dist}/lib/ant.jar"/> + + + dest="${watchdog.dist}/lib/testdriver.jar"/> - - + dest="${watchdog.dist}/lib/jsp-golden"/> - - + + - + - + + + - + 1.6 +0 -1 jakarta-watchdog/src/bin/watchdog.bat Index: watchdog.bat =================================================================== RCS file: /home/cvs/jakarta-watchdog/src/bin/watchdog.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- watchdog.bat 2000/04/03 20:34:33 1.5 +++ watchdog.bat 2000/05/01 19:36:19 1.6 @@ -19,7 +19,6 @@ SET CLASSPATH=%WATCHDOG_HOME%\lib\moo.jar;%CLASSPATH% SET CLASSPATH=%WATCHDOG_HOME%\lib\testdriver.jar;%CLASSPATH% SET CLASSPATH=%WATCHDOG_HOME%\lib\client.jar;%CLASSPATH% -SET CLASSPATH=%WATCHDOG_HOME%\lib\xml.jar;%CLASSPATH% SET CLASSPATH=%WATCHDOG_HOME%\lib\ant.jar;%CLASSPATH% echo "using classpath=" %CLASSPATH% 1.7 +0 -1 jakarta-watchdog/src/bin/watchdog.sh Index: watchdog.sh =================================================================== RCS file: /home/cvs/jakarta-watchdog/src/bin/watchdog.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- watchdog.sh 2000/04/03 20:34:33 1.6 +++ watchdog.sh 2000/05/01 19:36:19 1.7 @@ -58,7 +58,6 @@ CLASSPATH=${WATCHDOG_HOME}/lib/moo.jar:$CLASSPATH CLASSPATH=${WATCHDOG_HOME}/lib/testdriver.jar:$CLASSPATH CLASSPATH=${WATCHDOG_HOME}/lib/client.jar:$CLASSPATH -CLASSPATH=${WATCHDOG_HOME}/lib/xml.jar:$CLASSPATH CLASSPATH=$CLASSPATH:${JAVA_HOME}/lib/tools.jar CLASSPATH=$CLASSPATH:${JAVA_HOME}/lib/classes.zip 1.2 +8 -11 jakarta-watchdog/src/conf/jsp-gtest.xml Index: jsp-gtest.xml =================================================================== RCS file: /home/cvs/jakarta-watchdog/src/conf/jsp-gtest.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jsp-gtest.xml 2000/04/03 20:33:23 1.1 +++ jsp-gtest.xml 2000/05/01 19:36:20 1.2 @@ -1,12 +1,12 @@ - + - - - - - - - + + + + + + + @@ -562,9 +562,6 @@ debug="0" host="${host}" port="${port}" goldenFile="${wgdir}/tagext/VariableInfo/positiveGetClassName.html" /> - - - + + 1.2 +7 -13 jakarta-watchdog/src/conf/servlet-gtest.xml Index: servlet-gtest.xml =================================================================== RCS file: /home/cvs/jakarta-watchdog/src/conf/servlet-gtest.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- servlet-gtest.xml 2000/04/03 20:33:25 1.1 +++ servlet-gtest.xml 2000/05/01 19:36:20 1.2 @@ -1,15 +1,14 @@ - + - - - + + - - - + + + + - - - - - - 1.2 +8 -10 jakarta-watchdog/src/conf/servlet-moo.xml Index: servlet-moo.xml =================================================================== RCS file: /home/cvs/jakarta-watchdog/src/conf/servlet-moo.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- servlet-moo.xml 2000/04/03 20:33:25 1.1 +++ servlet-moo.xml 2000/05/01 19:36:20 1.2 @@ -1,13 +1,12 @@ - + - - - - + + + @@ -20,13 +19,13 @@ + -" /> @@ -35,11 +34,11 @@ - - + + @@ -215,7 +214,7 @@ -" /> + @@ -227,4 +226,3 @@ -