jvanzyl     02/02/12 07:45:24

  Modified:    .        Tag: rundata_security_changes build.xml
                        default.properties
  Log:
  - first step at creating a reusable target for copying resources
    into the JAR for deployment. i now have to make a little task
    that creates a pattern set from a descriptor. i can reuse the
    create-path task.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.5  +39 -14    jakarta-turbine-3/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
  retrieving revision 1.20.2.4
  retrieving revision 1.20.2.5
  diff -u -r1.20.2.4 -r1.20.2.5
  --- build.xml 12 Feb 2002 14:59:40 -0000      1.20.2.4
  +++ build.xml 12 Feb 2002 15:45:24 -0000      1.20.2.5
  @@ -24,6 +24,12 @@
     <!-- ================================================================== -->
     <!-- I N I T I A L I Z E                                                -->
     <!-- ================================================================== -->
  +  <!-- This deals with loading our path creation task that is used to:    -->
  +  <!--                                                                    --> 
  +  <!-- i) construct a classpath from a descriptor file which allows us    -->
  +  <!--    to create store our dependencies externally and makes a build   -->
  +  <!--    file reusable.                                                  -->
  +  <!-- ================================================================== -->
     <target
       name="init">
   
  @@ -77,10 +83,14 @@
     <target 
       name="env"
       depends="init">
  -    <echo message="java.home = ${java.home}"/>
  -    <echo message="user.home = ${user.home}"/>
  -    <echo message="lib.repo = ${lib.repo}"/>
  -
  +    
  +    <echo>
  +      java.home = ${java.home}
  +      user.home = ${user.home}
  +      lib.repo = ${lib.repo}
  +      jar.resources = ${jar.resources}
  +    </echo>      
  +      
       <property name="classpath" refid="classpath"/>
   
       <echo message="Classpath created from deps.list:"/>
  @@ -118,15 +128,6 @@
         optimize="${optimize}">
         <classpath refid="classpath"/>
       </javac>
  -
  -    <!-- Include the pipeline and valve XML descriptors -->
  -    <copy todir="${build.dest}/conf" filtering="yes">
  -      <fileset dir="${conf.dir}">
  -        <include name="**/*pipeline.xml"/>
  -        <include name="**/*valve.xml"/>
  -      </fileset>
  -    </copy>
  -
     </target>
   
     <!-- =================================================================== -->
  @@ -158,12 +159,36 @@
     </target>
   
     <!-- ================================================================== -->
  +  <!-- J A R  R E S O U R C E S                                           -->
  +  <!-- ================================================================== -->
  +  <target
  +    name="jar-resources"
  +    if="jar.resources">
  +
  +    <!-- Copy any resources that must be present in the deployed
  +         JAR file.
  +    -->
  +    
  +    <echo>
  +      Copy resources into destination directory for deployment
  +      in the JAR.
  +    </echo>
  +    
  +    <copy todir="${build.dest}">
  +      <fileset dir="${basedir}">
  +        <include name="${conf.dir}/*pipeline.xml"/>
  +        <include name="${conf.dir}/*valve.xml"/>
  +      </fileset>
  +    </copy>
  +  </target>    
  +
  +  <!-- ================================================================== -->
     <!-- J A R                                                              -->
     <!-- ================================================================== -->
   
     <target
       name="jar"
  -    depends="compile"
  +    depends="compile,jar-resources"
       description="--> generates the turbine.jar file (default)">
   
       <jar
  
  
  
  1.12.2.3  +6 -1      jakarta-turbine-3/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
  retrieving revision 1.12.2.2
  retrieving revision 1.12.2.3
  diff -u -r1.12.2.2 -r1.12.2.3
  --- default.properties        12 Feb 2002 14:52:03 -0000      1.12.2.2
  +++ default.properties        12 Feb 2002 15:45:24 -0000      1.12.2.3
  @@ -14,7 +14,7 @@
   build.src = ${build.dir}/src
   build.dest = ${build.dir}/classes
   src.dir = ./src
  -conf.dir = ./conf
  +conf.dir = conf
   javadoc.destdir = ./docs/apidocs
   jakarta.site2 = ../jakarta-site2
   turbine.jars = ./lib
  @@ -31,6 +31,11 @@
   src.aspects.dir = ${src.dir}/aspects
   
   srcdir = ${src.java.dir}/org:${src.dir}/tool/org
  +
  +# -------------------------------------------------------------------
  +# J A R  R E S O U R C E S
  +# -------------------------------------------------------------------
  +jar.resources = true
   
   # -------------------------------------------------------------------
   # D O C U M E N T A T I O N
  
  
  

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

Reply via email to