jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-watchdog-4.0/src/bin watchdog.bat watchdog.sh
Date Fri, 19 Jan 2001 22:47:56 GMT
craigmcc    01/01/19 14:47:56

  Modified:    .        build.xml
               src/bin  watchdog.bat watchdog.sh
  Log:
  Update the build process for Watchdog so that the XML-syntax versions of
  all the JSP pages are created at build time, rather than every time you
  execute the "jsp-xml" suite.  In addition, this eliminates the current
  dependency on Tomcat in order to run the jsp-xml suite.
  
  Revision  Changes    Path
  1.6       +17 -3     jakarta-watchdog-4.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	2000/12/01 00:59:26	1.5
  +++ build.xml	2001/01/19 22:47:55	1.6
  @@ -58,7 +58,7 @@
   
      <!-- Compile the test suite -->
   
  -   <target name="main" depends="prepare">
  +   <target name="compile" depends="prepare">
   
         <javac srcdir="src/server/servlet-tests/WEB-INF/classes"
                destdir="${watchdog.build}/webapps/servlet-tests/WEB-INF/classes"
  @@ -97,6 +97,20 @@
   
      </target>
   
  +   <!-- Convert the JSP syntax pages to their XML equivalents -->
  +   <target name="xml" depends="prepare,compile">
  +
  +       <java classname="org.apache.jspxml.GetWorkspaceInXML" fork="true"
  +             classpath="${watchdog-classpath}:${watchdog.build}/src/tools">
  +          <sysproperty key="JSP_ROOT" value="${watchdog.build}/webapps/jsp-tests/jsp"/>
  +          <sysproperty key="WATCHDOG_HOME" value="${watchdog.build}"/>
  +       </java>
  +
  +   </target>
  +
  +   <!-- Default build target -->
  +   <target name="main" depends="xml"/>
  +
      <!-- Prepare the distribution destination directory -->
   
      <target name="dist" depends="main">
  @@ -124,11 +138,11 @@
         <copydir src="src/clients/org/apache/jcheck/servlet/client" 
                 dest="${watchdog.dist}/lib/servlet-golden"/>
   
  -      <copydir  src="src/bin" dest="${watchdog.dist}/bin"/>
  +      <copydir  src="${watchdog.build}/bin" dest="${watchdog.dist}/bin"/>
         <fixcrlf  srcdir="${watchdog.dist}/bin" includes="*.sh" cr="remove"/>
         <fixcrlf  srcdir="${watchdog.dist}/bin" includes="*.bat" cr="add"/>
         <chmod       dir="${watchdog.dist}/bin" includes="*.sh" perm="+x"/>
  -      <copydir  src="src/conf" dest="${watchdog.dist}/conf" />
  +      <copydir  src="${watchdog.build}/conf" dest="${watchdog.dist}/conf" />
       
         <jar jarfile="${watchdog.dist}/lib/client.jar"
           basedir="${watchdog.build}/clients" 
  
  
  
  1.6       +7 -7      jakarta-watchdog-4.0/src/bin/watchdog.bat
  
  Index: watchdog.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/bin/watchdog.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- watchdog.bat	2000/12/13 18:04:01	1.5
  +++ watchdog.bat	2001/01/19 22:47:55	1.6
  @@ -34,15 +34,15 @@
   
   echo "using classpath=" %CLASSPATH%
   
  -if not "%SUITE%"=="jsp-xml" goto runit
  -if not "%TOMCAT_HOME%" == "" goto gotTomcatHome
  -echo You must set TOMCAT_HOME to point at your TOMCAT-4.0 installation
  -goto end
  -:gotTomcatHome
  +#if not "%SUITE%"=="jsp-xml" goto runit
  +#if not "%TOMCAT_HOME%" == "" goto gotTomcatHome
  +#echo You must set TOMCAT_HOME to point at your TOMCAT-4.0 installation
  +#goto end
  +#:gotTomcatHome
   
  -%JAVA_HOME%\bin\java -DJSP_ROOT=%TOMCAT_HOME%\webapps\jsp-tests\jsp -DWATCHDOG_HOME=%WATCHDOG_HOME%
org.apache.jspxml.GetWorkspaceInXML
  +#%JAVA_HOME%\bin\java -DJSP_ROOT=%TOMCAT_HOME%\webapps\jsp-tests\jsp -DWATCHDOG_HOME=%WATCHDOG_HOME%
org.apache.jspxml.GetWorkspaceInXML
   
  -:runit
  +#:runit
   rem Execute the Requested Test Suite
   %JAVA_HOME%\bin\java org.apache.tools.ant.Main -Dport=%PORT% -Dhost=%HOST% "-Dwatchdog.home=%WATCHDOG_HOME%"
-f "%WATCHDOG_HOME%\conf\runtest.xml" %SUITE%
   
  
  
  
  1.5       +8 -8      jakarta-watchdog-4.0/src/bin/watchdog.sh
  
  Index: watchdog.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/bin/watchdog.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- watchdog.sh	2000/12/19 22:04:03	1.4
  +++ watchdog.sh	2001/01/19 22:47:56	1.5
  @@ -51,9 +51,9 @@
       exit 1
   fi
   
  -if [ "$JAKARTA_HOME" != "" ] ; then
  -   TOMCAT_HOME=${JAKARTA_HOME}/tomcat-4.0
  -fi
  +#if [ "$JAKARTA_HOME" != "" ] ; then
  +#   TOMCAT_HOME=${JAKARTA_HOME}/tomcat-4.0
  +#fi
   
   
   cp=$CLASSPATH
  @@ -74,15 +74,15 @@
   echo Using classpath: ${CLASSPATH}
   echo
   
  -echo Using Tomcat_HOME: ${TOMCAT_HOME}
  -echo
  +#echo Using Tomcat_HOME: ${TOMCAT_HOME}
  +#echo
   
   echo Using Watchdog_HOME: ${WATCHDOG_HOME}
   echo
   
  -if [ "$1" = "jsp-xml" ] ; then
  -	java -DJSP_ROOT=${TOMCAT_HOME}/webapps/jsp-tests/jsp -DWATCHDOG_HOME=${WATCHDOG_HOME}
org.apache.jspxml.GetWorkspaceInXML
  -fi
  +#if [ "$1" = "jsp-xml" ] ; then
  +#	java -DJSP_ROOT=${TOMCAT_HOME}/webapps/jsp-tests/jsp -DWATCHDOG_HOME=${WATCHDOG_HOME}
org.apache.jspxml.GetWorkspaceInXML
  +#fi
   
   
   java org.apache.tools.ant.Main -Dport=${PORT} -Dhost=${HOST} \
  
  
  

Mime
View raw message