You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by cr...@apache.org on 2002/12/27 19:30:23 UTC

cvs commit: jakarta-commons-sandbox/resources build.xml

craigmcc    2002/12/27 10:30:23

  Modified:    resources build.xml
  Log:
  Add commons-logging.jar to the compile classpath.  Add options so that you
  can run the unit tests under Tomcat 4.1 using the manager webapp's
  "install" and "remove" commands (much faster than starting and stopping
  Tomcat every time).
  
  Now I just need to get the tests themselves to work ...
  
  Revision  Changes    Path
  1.12      +33 -3     jakarta-commons-sandbox/resources/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	28 Jul 2002 04:24:18 -0000	1.11
  +++ build.xml	27 Dec 2002 18:30:23 -0000	1.12
  @@ -29,6 +29,9 @@
     <!-- The home directory for the BeanUtils package -->
     <property name="commons-beanutils.home" value="../beanutils/dist" />
   
  +  <!-- The home directory for the Logging package -->
  +  <property name="commons-logging.home" value="../logging/dist" />
  +
     <!-- The directory containing your binary distribution of JUnit,
          version 3.2 or later -->
     <property name="junit.home"              value="/usr/local/junit3.5" />
  @@ -42,6 +45,10 @@
     <!-- The directory containing Tomcat >= 4.0 -->
     <property name="tomcat.4.home"             value="/usr/local/jakarta-tomcat-4.0" />
   
  +  <!-- The manager webapp URL, username, and password for Tomcat >= 4.1 -->
  +  <property name="manager.url" value="http://localhost:8080/manager" />
  +  <property name="manager.username" value="tomcat" />
  +  <property name="manager.password" value="tomcat" />
   
   
   <!-- ========== Derived Values ============================================ -->
  @@ -56,6 +63,9 @@
     <!-- The pathname of the "digester.jar" JAR file -->
     <property name="commons-digester.jar" value="${commons-digester.home}/commons-digester.jar" />
   
  +  <!-- The pathname of the logging JAR file -->
  +  <property name="commons-logging.jar" value="${commons-logging.home}/commons-logging.jar" />
  +
     <!-- The pathname of the "junit.jar" JAR file -->
     <property name="junit.jar"               value="${junit.home}/junit.jar"/>
   
  @@ -92,7 +102,7 @@
     <property name="component.version"       value="0.1-dev"/>
   
     <!-- The base directory for compilation targets -->
  -  <property name="build.home"              value="target"/>
  +  <property name="build.home"              value="${basedir}/target"/>
   
     <!-- The base directory for component configuration files -->
     <property name="conf.home"               value="src/conf"/>
  @@ -159,6 +169,7 @@
       <pathelement location="${commons-collections.jar}"/>
       <pathelement location="${commons-digester.jar}"/>
       <pathelement location="${commons-beanutils.jar}"/>
  +    <pathelement location="${commons-logging.jar}"/>
       <pathelement location="${servlet.jar}" />
       <pathelement location="${cactus.jar}" />
       <pathelement location="${cactus-ant.jar}" />
  @@ -303,6 +314,25 @@
     </target>
   
   
  +  <target name="install.tomcat.4">
  +    <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
  +    <install url="${manager.url}" username="${manager.username}"
  +        password="${manager.password}" path="/test-webapp-resource"
  +             war="file://${build.home}/webapps/test-webapp-resource"/>
  +  </target>
  +
  +  <target name="list.tomcat.4">
  +    <taskdef name="list" classname="org.apache.catalina.ant.ListTask"/>
  +    <list url="${manager.url}" username="${manager.username}"
  +     password="${manager.password}"/>
  +  </target>
  +
  +  <target name="remove.tomcat.4">
  +    <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
  +    <remove url="${manager.url}" username="${manager.username}"
  +       password="${manager.password}" path="/test-webapp-resource"/>
  +  </target>
  +
     <target name="clean"
      description="Clean build and distribution directories">
       <delete    dir="${build.home}"/>
  @@ -355,7 +385,7 @@
   
   
     <target name="test"  depends="build.tests"
  -          description="Run all unit test cases" >
  +          description="Run all unit test cases (Tomcat 4.0)" >
   
       <taskdef name="runservertests"
                classname="org.apache.cactus.ant.RunServerTestsTask">
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>