dlr         02/01/10 19:31:00

  Modified:    .        build.xml
  Log:
  o Removed build.src and build.dest properties -- they're defined in
  default properties.
  
  o Moved the copying of the standard pipeline and valve descriptors
  down into the compilation target so they will actually be built into
  the JAR file (adjusted their destination accordingly).
  
  Revision  Changes    Path
  1.13      +7 -5      jakarta-turbine-3/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -u -r1.12 -r1.13
  --- build.xml 11 Jan 2002 02:46:50 -0000      1.12
  +++ build.xml 11 Jan 2002 03:31:00 -0000      1.13
  @@ -14,8 +14,6 @@
     <!-- Set default values for the build -->
     <property file="default.properties" />
   
  -  <property name="build.src" value="${build.dir}/src"/>
  -  <property name="build.dest" value="${build.dir}/classes"/>
     <property name="src.java.dir" value="${src.dir}/java"/>
     <property name="src.test.dir" value="${src.dir}/test"/>
     <property name="src.adapter.dir" value="${src.dir}/adapter"/>
  @@ -253,7 +251,6 @@
       <copy todir="${build.src}/org" filtering="yes">
         <fileset dir="${src.java.dir}/org">
           <include name="**/*.java"/>
  -        <include name="**/*.xml"/>
           <include name="**/package.html"/>
           <exclude name="**/*Jsp*.java"/>
           <exclude name="**/jsp/**"/>
  @@ -286,7 +283,7 @@
     <target name="compile"
             depends="prepare, prepare-jsp"
             description="--> compiles the source code">
  -    
  +
       <javac 
         srcdir="${build.src}"
         destdir="${build.dest}"
  @@ -296,7 +293,12 @@
         optimize="${optimize}">
         <classpath refid="classpath"/>
       </javac>
  -    
  +
  +    <!-- Include the pipeline and valve XML descriptors -->
  +    <copy todir="${build.dest}/org" filtering="yes">
  +      <fileset dir="${src.java.dir}/org" includes="**/*.xml"/>
  +    </copy>
  +
     </target>
   
     <!-- ================================================================== -->
  
  
  

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

Reply via email to