rubys       01/08/18 14:38:00

  Modified:    proposal/gump/project jakarta-commons.xml
  Log:
  Add util directory to the classpath.  Fix errant name of jar produced
  by cactus23.  Eliminate extraneous trailing slashes in work dirs.
  
  Also restore some whitespace that was inexplicably "normalized" out...
  
  Revision  Changes    Path
  1.29      +16 -6     jakarta-alexandria/proposal/gump/project/jakarta-commons.xml
  
  Index: jakarta-commons.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-commons.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jakarta-commons.xml       2001/08/18 11:08:19     1.28
  +++ jakarta-commons.xml       2001/08/18 21:37:59     1.29
  @@ -21,7 +21,6 @@
   
     <!-- Build the Cactus project ant tasks -->
     <project name="commons-cactus-ant">
  -
       <ant basedir="cactus" buildfile="build/build.xml" target="jar.ant"/>
   
       <depend project="jakarta-ant"/>
  @@ -37,6 +36,7 @@
       <description>
         Unit test framework for J2EE server-side java code
       </description>
  +
       <ant basedir="cactus" buildfile="build/build.xml" target="all">
         <property name="tomcat.home.33" reference="home"
                   project="jakarta-tomcat"/>
  @@ -45,14 +45,18 @@
         <depend property="log4j.jar"     project="jakarta-log4j" id="log4j-core"/>
         <depend property="httpunit.jar"  project="httpunit"/>
       </ant>
  +
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
       <depend project="xml-stylebook2"/>
       <depend project="xml-xalan2"/>
       <depend project="jakarta-tomcat"/>
       <depend project="commons-cactus-ant"/>
  -    <work nested="cactus/out/servlet22/classes/"/>
  -    <work nested="cactus/out/classes/"/>
  +
  +    <work nested="cactus/out/servlet22/classes"/>
  +    <work nested="cactus/out/classes"/>
  +    <work nested="cactus/util"/>
  +
       <home nested="cactus/out"/>
       <jar name="servlet22/dist/lib/commons-cactus.jar"/>
     </project>
  @@ -60,9 +64,11 @@
     <!-- Build the Cactus project for Servlet API 2.3 -->
     <project name="commons-cactus-23">
       <url href="http://jakarta.apache.org/commons/cactus/index.html"/>
  +
       <description>
         Unit test framework for J2EE server-side java code
       </description>
  +
       <ant basedir="cactus" buildfile="build/build.xml" target="all">
         <property name="tomcat.home.40" reference="home"
                   project="jakarta-tomcat-4.0"/>
  @@ -71,16 +77,20 @@
         <depend property="log4j.jar" project="jakarta-log4j" id="log4j-core"/>
         <depend property="httpunit.jar"  project="httpunit"/>
       </ant>
  +
       <depend project="jakarta-ant"/>
       <depend project="xml-xerces"/>
       <depend project="xml-stylebook2"/>
       <depend project="xml-xalan2"/>
       <depend project="jakarta-tomcat-4.0"/>
       <depend project="commons-cactus-ant"/>
  -    <work nested="cactus/out/servlet23/classes/"/>
  -    <work nested="cactus/out/classes/"/>
  +
  +    <work nested="cactus/out/servlet23/classes"/>
  +    <work nested="cactus/out/classes"/>
  +    <work nested="cactus/util"/>
  +
       <home nested="cactus/out"/>
  -    <jar name="commons-cactus-ant.jar"/>
  +    <jar name="servlet23/dist/lib/commons-cactus.jar"/>
     </project>
   
     <project name="commons-collections">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to