You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/02/04 12:34:26 UTC

cvs commit: jakarta-turbine-3 build.xml default.properties

mpoeschl    02/02/04 03:34:26

  Modified:    .        build.xml default.properties
  Log:
  use xerces 2.0.0
  
  Revision  Changes    Path
  1.21      +17 -16    jakarta-turbine-3/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml	22 Jan 2002 14:13:18 -0000	1.20
  +++ build.xml	4 Feb 2002 11:34:26 -0000	1.21
  @@ -36,14 +36,15 @@
       <pathelement location="${stratum.jar}"/>
       <pathelement location="${velocity.jar}"/>
       <pathelement location="${xerces.jar}"/>
  +    <pathelement location="${xmlParserAPIs.jar}"/>
       <pathelement location="${commons-collections.jar}"/>
       <pathelement location="${commons-util.jar}"/>
       <pathelement location="${stratum.jar}"/>
  -    
  +
       <!-- AspectJ Jars for non-invasive use of aspects -->
       <pathelement location="${aspectjrt.jar}"/>
       <pathelement location="${aspectjtools.jar}"/>
  -    
  +
       <!-- Required for auto jar updating -->
       <pathelement location="tdk.jar"/>
     </path>
  @@ -368,7 +369,7 @@
     <!-- Compiles the source directory                                      -->
     <!-- ================================================================== -->
   
  -  <target 
  +  <target
       name="compile"
       depends="prepare, prepare-jsp"
       description="--> compiles the source code">
  @@ -396,10 +397,10 @@
     <!-- =================================================================== -->
     <!-- A S P E C T  C O M P I L E                                          -->
     <!-- =================================================================== -->
  -  <target 
  -    name="acompile" 
  +  <target
  +    name="acompile"
       depends="prepare">
  -    
  +
       <!-- Move aspects into the build cycle -->
       <copy todir="${build.src}/org" filtering="yes">
         <fileset dir="${src.aspects.dir}/org">
  @@ -407,7 +408,7 @@
         </fileset>
       </copy>
   
  -    <taskdef 
  +    <taskdef
         name="ajc"
         classname="org.aspectj.tools.ant.taskdefs.Ajc"/>
   
  @@ -418,14 +419,14 @@
         optimize="${optimize}">
         <classpath refid="classpath"/>
       </ajc>
  -            
  +
     </target>
   
     <!-- ================================================================== -->
     <!-- Compiles the source directory and creates a .jar file              -->
     <!-- ================================================================== -->
   
  -  <target 
  +  <target
       name="jar"
       depends="compile"
       description="--> generates the turbine.jar file (default)">
  @@ -441,7 +442,7 @@
     <!-- D I S T R I B U T I O N S                                          -->
     <!-- ================================================================== -->
   
  -  <target 
  +  <target
       name="dist"
       depends="jar,javadocs">
   
  @@ -454,7 +455,7 @@
         | C R E A T I N G  B I N A R Y  D I S T R I B U T I O N |
         +-------------------------------------------------------+
       </echo>
  -    
  +
       <mkdir dir="${distDir}"/>
   
       <!-- Copy README and LICENSE -->
  @@ -481,10 +482,10 @@
           <include name="${final.name}/**"/>
         </tarfileset>
       </tar>
  -    
  +
       <gzip zipfile="${final.name}.tar.gz" src="${final.name}.tar"/>
       <delete file="${final.name}.tar"/>
  -    
  +
       <!-- Create a zip file -->
       <zip zipfile="${final.name}.zip">
         <zipfileset dir="${build.dir}">
  @@ -505,7 +506,7 @@
           <include name="**/*.jar"/>
         </fileset>
       </delete>
  -    
  +
       <copy todir="${distDir}" file="default.properties"/>
       <copy todir="${distDir}" file="build.xml"/>
   
  @@ -522,10 +523,10 @@
           <include name="${final.name}/**"/>
         </tarfileset>
       </tar>
  -    
  +
       <gzip zipfile="${final.name}-src.tar.gz" src="${final.name}-src.tar"/>
       <delete file="${final.name}-src.tar"/>
  -    
  +
       <!-- Create a zip file -->
       <zip zipfile="${final.name}-src.zip">
         <zipfileset dir="${build.dir}">
  
  
  
  1.13      +4 -3      jakarta-turbine-3/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- default.properties	22 Jan 2002 15:09:35 -0000	1.12
  +++ default.properties	4 Feb 2002 11:34:26 -0000	1.13
  @@ -20,13 +20,13 @@
   docs.src = ./xdocs
   docs.dest = ./docs
   turbine.jars = ./lib
  -year = 1999-2001
  +year = 1999-2002
   debug = on
   optimize = off
   deprecation = off
   
   # Please see the BUILDING.txt file for information
  -# on the locations of where to find each of these 
  +# on the locations of where to find each of these
   # jar files
   
   velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
  @@ -36,7 +36,8 @@
   regexp.jar = ${lib.repo}/jakarta-regexp-1.3-dev.jar
   torque.jar = ${lib.repo}/torque-3.0-dev.jar
   jaf.jar = ${lib.repo}/activation-1.0.1.jar
  -xerces.jar = ${lib.repo}/xerces-1.4.4.jar
  +xerces.jar = ${lib.repo}/xercesImpl-2.0.0.jar
  +xmlParserAPIs.jar = ${lib.repo}/xmlParserAPIs-2.0.0.jar
   commons-collections.jar = ${lib.repo}/commons-collections.jar
   commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
   stratum.jar = ${lib.repo}/stratum-0.1-dev.jar
  
  
  

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