You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/07/08 23:26:15 UTC

cvs commit: jakarta-cactus/samples/jetty/src/script build.properties build.xml

cmlenz      2003/07/08 14:26:15

  Modified:    samples/jetty/src/script build.properties build.xml
  Log:
  - Run the tests via the TestAll suite, instead of using <batchtest>, so that Jetty doesn't need to be initialized for each test
  - Make the path to tools.jar configurable via build.properties
  
  Revision  Changes    Path
  1.2       +4 -1      jakarta-cactus/samples/jetty/src/script/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/samples/jetty/src/script/build.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.properties	7 Jul 2003 20:16:22 -0000	1.1
  +++ build.properties	8 Jul 2003 21:26:15 -0000	1.2
  @@ -40,6 +40,9 @@
   
   # The location of the Jasper runtime jar
jasperr.jar = lib/@jasperr.jar.name@
   
  +# The location of the jar containing the Java compiler used by Jasper
  +tools.jar = ${java.home}/../lib/tools.jar
  +
   # -----------------------------------------------------------------------------
   # Optional properties
   # -----------------------------------------------------------------------------
  
  
  
  1.3       +4 -6      jakarta-cactus/samples/jetty/src/script/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/samples/jetty/src/script/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	8 Jul 2003 19:56:39 -0000	1.2
  +++ build.xml	8 Jul 2003 21:26:15 -0000	1.3
  @@ -46,6 +46,7 @@
   
     <!-- Properties for the Cactus tests -->
     <property name="cactus.port" value="8080"/>
  +  <property name="tools.jar" location="${java.home}/../lib/tools.jar"/>
   
     <!--
        ========================================================================
  @@ -239,15 +240,12 @@
           <path refid="cactus.classpath"/>
           <pathelement location="${target.classes.java.dir}"/>
           <pathelement location="${target.classes.cactus.dir}"/>
  -        <pathelement location="${java.home}/../lib/tools.jar"/>
  +        <pathelement location="${tools.jar}"/>
         </classpath>
         <formatter type="brief" usefile="false"/>
         <formatter type="xml"/>
  -      <batchtest todir="${target.testreports.dir}">
  -        <fileset dir="${src.cactus.dir}">
  -          <include name="**/sample/Test*.java"/>
  -        </fileset>
  -      </batchtest>
  +      <test todir="${target.testreports.dir}"
  +          name="org.apache.cactus.sample.TestAll"/>
       </junit>
   
       <junitreport todir="${target.testreports.dir}">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org