cvs commit: jakarta-watchdog/src/bin runtest.bat

[ru...@locus.apache.org]

rubys       00/02/13 18:41:55

  Modified:    .        build.xml
               src/bin  runtest.bat
  Log:
  Steps towards getting watchdog to start...
  
  Revision  Changes    Path
  1.23      +2 -0      jakarta-watchdog/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.xml	2000/02/03 23:49:13	1.22
  +++ build.xml	2000/02/14 02:41:54	1.23
  @@ -60,6 +60,7 @@
   
         <copydir src="src/bin" dest="${watchdog.build}"/>
         <copydir src="src/conf" dest="${watchdog.build}/conf" />
  +      <copyfile src="${tomcat.build}/conf/web.xml" dest="${watchdog.build}/conf/web.xml" />
   
         <copyfile src="../jakarta-tools/moo.jar" 
                   dest="${watchdog.build}/webapps/servlet-tests/WEB-INF/lib/moo.jar"/>
  @@ -115,6 +116,7 @@
         <copydir src="src/bin" dest="${watchdog.dist}"/>
         <copydir src="src/conf" dest="${watchdog.dist}/conf" />
         <copyfile src="src/conf/dist-test.xml" dest="${watchdog.dist}/conf/server-test.xml" />
  +      <copyfile src="${tomcat.build}/conf/web.xml" dest="${watchdog.dist}/conf/web.xml" />
       
         <chmod src="${watchdog.dist}/runClient.sh" perm="+x"/>
         <chmod src="${watchdog.dist}/runTest.sh" perm="+x"/> 
  
  
  
  1.7       +3 -3      jakarta-watchdog/src/bin/runtest.bat
  
  Index: runtest.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/src/bin/runtest.bat,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- runtest.bat	2000/01/08 00:28:47	1.6
  +++ runtest.bat	2000/02/14 02:41:55	1.7
  @@ -1,5 +1,5 @@
   @echo off
  -rem $Id: runtest.bat,v 1.6 2000/01/08 00:28:47 craigmcc Exp $
  +rem $Id: runtest.bat,v 1.7 2000/02/14 02:41:55 rubys Exp $
   rem Startup batch file for servlet runner.
   
   rem This batch file written and tested under Windows NT
  @@ -60,7 +60,7 @@
   rem Only start Tomcat if no host and port parameters have been specified
   if not "%port%"=="8080" goto otherserver
   
  -start java org.apache.tomcat.shell.Startup -config .\conf\server-test.xml %1 %2 %3 %4 %5 %6 %7 %8 %9
  +java org.apache.tomcat.startup.Tomcat -config .\conf\server-test.xml %4 %5 %6 %7 %8 %9
   
   sleep 25
   
  @@ -80,7 +80,7 @@
   rem Only shutdown Tomcat if no host and port parameters have been specified
   if not "%port%"=="8080" goto cleanup
   
  -java org.apache.tomcat.shell.Shutdown %1 %2 %3 %4 %5 %6 %7 %8 %9
  +java org.apache.tomcat.startup.Tomcat -stop -config .\conf\server-test.xml %4 %5 %6 %7 %8 %9
   
   :cleanup
   rem clean up