You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by ru...@apache.org on 2002/02/25 01:12:04 UTC

cvs commit: jakarta-alexandria/proposal/gump/project jakarta-cactus.xml

rubys       02/02/24 16:12:04

  Modified:    proposal/gump/project jakarta-cactus.xml
  Log:
  The Cactus custom Ant tasks are now in their own
  subproject (in jakarta-cactus/anttasks).
  Submitted by:	Vincent Massol <vm...@octo.com>
  
  Revision  Changes    Path
  1.11      +15 -15    jakarta-alexandria/proposal/gump/project/jakarta-cactus.xml
  
  Index: jakarta-cactus.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-cactus.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jakarta-cactus.xml	6 Jan 2002 16:05:19 -0000	1.10
  +++ jakarta-cactus.xml	25 Feb 2002 00:12:04 -0000	1.11
  @@ -9,13 +9,13 @@
   
     <!-- Build the Cactus project ant tasks -->
     <project name="jakarta-cactus-ant">
  -    <ant buildfile="build/build.xml" target="jar.ant"/>
  +    <ant buildfile="anttasks/build.xml" target="nightly"/>
   
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
   
  -    <home nested="target"/>
  -    <jar name="cactus-ant.jar"/>
  +    <home nested="dist"/>
  +    <jar name="lib/cactus-ant.jar"/>
     </project>
   
     <!-- Build the Cactus project for Servlet API 2.2 -->
  @@ -24,12 +24,13 @@
         <property name="test.port" value="8081"/>
         <property name="tomcat.home.33" reference="home"
                   project="jakarta-tomcat"/>
  -      <depend property="servlet22.jar" project="jakarta-servletapi"/>
  -      <depend property="junit.jar"     project="junit"/>
  -      <depend property="log4j.jar"     project="jakarta-log4j"/>
  -      <depend property="httpunit.jar"  project="httpunit"/>
  +      <depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
  +      <depend property="servlet22.jar"  project="jakarta-servletapi"/>
  +      <depend property="junit.jar"      project="junit"/>
  +      <depend property="log4j.jar"      project="jakarta-log4j"/>
  +      <depend property="httpunit.jar"   project="httpunit"/>
         <depend property="httpclient.jar" project="commons-httpclient"/>
  -      <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
  +      <depend property="aspectjrt.jar"  project="aspectj" id="aspectjrt"/>
       </ant>
   
       <depend project="jakarta-ant"/>
  @@ -37,7 +38,6 @@
       <depend project="xml-stylebook2"/>
       <depend project="xml-xalan2"/>
       <depend project="jakarta-tomcat"/>
  -    <depend project="jakarta-cactus-ant"/>
       <depend project="aspectj"/>
   
       <work nested="target/classes"/>
  @@ -54,12 +54,13 @@
         <property name="test.port" value="8082"/>
         <property name="tomcat.home.40" reference="home"
                   project="jakarta-tomcat-4.0"/>
  -      <depend property="servlet23.jar" project="jakarta-servletapi-4"/>
  -      <depend property="junit.jar" project="junit"/>
  -      <depend property="log4j.jar" project="jakarta-log4j"/>
  -      <depend property="httpunit.jar"  project="httpunit"/>
  +      <depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
  +      <depend property="servlet23.jar"  project="jakarta-servletapi-4"/>
  +      <depend property="junit.jar"      project="junit"/>
  +      <depend property="log4j.jar"      project="jakarta-log4j"/>
  +      <depend property="httpunit.jar"   project="httpunit"/>
         <depend property="httpclient.jar" project="commons-httpclient"/>
  -      <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
  +      <depend property="aspectjrt.jar"  project="aspectj" id="aspectjrt"/>
       </ant>
   
       <depend project="jakarta-ant"/>
  @@ -67,7 +68,6 @@
       <depend project="xml-stylebook2"/>
       <depend project="xml-xalan2"/>
       <depend project="jakarta-tomcat-4.0" inherit="runtime"/>
  -    <depend project="jakarta-cactus-ant"/>
       <depend project="aspectj"/>
   
       <work nested="target/classes"/>
  
  
  

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