jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@locus.apache.org
Subject cvs commit: jakarta-watchdog/src/bin watchdog.bat watchdog.sh
Date Thu, 02 Mar 2000 00:54:16 GMT
arun        00/03/01 16:54:16

  Modified:    src/bin  watchdog.bat watchdog.sh
  Log:
  Minor fixes.
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-watchdog/src/bin/watchdog.bat
  
  Index: watchdog.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/src/bin/watchdog.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- watchdog.bat	2000/03/01 03:33:08	1.2
  +++ watchdog.bat	2000/03/02 00:54:15	1.3
  @@ -42,6 +42,6 @@
   goto end
   
   :exit
  -echo usage: %0 {all/jsp/servlet} [serverhost] [serverport]
  +echo usage: %0 {all/jsp/servlet} [serverhost] [serverport] 
   
   :end
  
  
  
  1.2       +28 -26    jakarta-watchdog/src/bin/watchdog.sh
  
  Index: watchdog.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/src/bin/watchdog.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- watchdog.sh	2000/03/01 03:33:08	1.1
  +++ watchdog.sh	2000/03/02 00:54:16	1.2
  @@ -1,60 +1,62 @@
  -#! /bin/sh
   #!/bin/sh
   #
   
   # Shell script to run watchdog test suite
    
  -# This script is known to work with the standard Korn Shell under
  -# Solaris and the MKS Korn shell under Windows.
  -
  -
  -if [ "$1" = "" ]; then
  +if [ "$1" = "" ] ; then
       echo usage: "$0 {all|jsp|servlet} [serverhost] [serverport]"
       exit 0
   fi
   
  -
  -host=localhost
  -port=8080
  +HOST=localhost
  +PORT=8080
   default=$1
  -
   
  -baseDir=..
  +if [ "$2" != "" ] ; then
  +    PORT=$2
  +fi
  +if [ "$3" != "" ] ; then
  +    HOST=$3
  +fi
   
  -miscJars=${baseDir}/lib/moo.jar:${baseDir}/lib/testdriver.jar:${baseDir}/lib/client.jar
  -appJars=${miscJars}:${baseDir}/lib/xml.jar:${baseDir}/lib/ant.jar
  -sysJars=${JAVA_HOME}/lib/tools.jar
  +#WATCHDOG_HOME=`pwd`/..
  +WATCHDOG_HOME=..
   
  -appClassPath=${appJars}
   cp=$CLASSPATH
   
  -CLASSPATH=${appClassPath}:${sysJars}
  +CLASSPATH=${WATCHDOG_HOME}/lib/ant.jar:$CLASSPATH
  +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
   
  -export CLASSPATH
  +CLASSPATH=$CLASSPATH:${JAVA_HOME}/lib/tools.jar
  +CLASSPATH=$CLASSPATH:${JAVA_HOME}/lib/classes.zip
   
  -if [ "$cp" != "" ]; then
  +if [ "$cp" != "" ] ; then
       CLASSPATH=${CLASSPATH}:${cp}
  -    export CLASSPATH
   fi
   
  +export CLASSPATH
  +
   echo Using classpath: ${CLASSPATH}
   echo
   
  -
  -
  -if [ "${default}" = jsp -o "${default}" = all ];then
  +if [ "${default}" = jsp -o "${default}" = all ] ; then
       java org.apache.tools.ant.Main -Dport=${PORT} -Dhost=${HOST} -Dwatchdog.home=\
  -         $WATCHDOG_HOME -f ${WATCHDOG_HOME}/conf/jsp.xml jsp-test
  +        ${WATCHDOG_HOME} -f ${WATCHDOG_HOME}/conf/jsp.xml jsp-test
   fi
   
  -if [ "${default}" = servlet -o "${default}" = all ];then
  +if [ "${default}" = servlet -o "${default}" = all ] ; then
       java org.apache.tools.ant.Main -Dtest.port=${PORT} -Dtest.hostname=${HOST}=\
  -         -Dwatchdog.home=${WATCHDOG_HOME} -f $WATCHDOG_HOME/conf/servlet.xml servlet-test
  +        -Dwatchdog.home=${WATCHDOG_HOME} -f ${WATCHDOG_HOME}/conf/servlet.xml servlet-test
   fi
   
  -if [ "$cp" != ""]; then
  +if [ "$cp" != "" ] ; then
       CLASSPATH=${cp}
       export CLASSPATH
   else
       unset CLASSPATH
   fi
  +
  +exit 0
  
  
  

Mime
View raw message