mpoeschl    01/12/27 04:06:39

  Modified:    src/tdk  build.xml
  Log:
  add some comments
  
  Revision  Changes    Path
  1.24      +63 -65    jakarta-turbine-tdk/src/tdk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml 2001/10/23 15:35:07     1.23
  +++ build.xml 2001/12/27 12:06:39     1.24
  @@ -3,25 +3,22 @@
   <!-- Build file for creating new applications with Turbine -->
   
   <project name="TDK" default="application" basedir=".">
  -    
  +
     <property file="${user.home}/build.properties"/>
     <property file="build.properties"/>
  -  
  +
     <!-- Do not edit these values -->
     <property name="app.src" value="tdk/apps/${tdk.turbineVersion}"/>
     <property name="ancillary.dir" value="tdk/ancillary"/>
     <property name="lib.dir" value="tdk/lib"/>
  -  
  +
     <!-- ================================================================ -->
     <!-- S E T U P  T A R G E T                                           -->
     <!-- ================================================================ -->
     <!-- Check that properties are defined correctly.                     -->
     <!-- ================================================================ -->
  -  
  -  <target 
  -    name="setup" 
  -    unless="tdk.home">
  -    
  +  <target name="setup"
  +          unless="tdk.home">
       <echo>
         ***
         * ERROR : The 'tdk.home' property is not defined or
  @@ -38,31 +35,34 @@
     <!-- =================================================================== -->
     <!-- P R O P E R T I E S                                                 -->
     <!-- =================================================================== -->
  -
  -  <target 
  -    name="properties">
  -    
  +  <target name="properties">
       <property file="tdk/build-classic.properties"/>
     </target>
   
  -  <target 
  -    name="cvslayout" 
  -    depends="setup,cvslayout-properties,properties">
  -    
  +  <!-- =================================================================== -->
  +  <!-- C V S L A Y O U T                                                   -->
  +  <!-- =================================================================== -->
  +  <target name="cvslayout"
  +          depends="setup,cvslayout-properties"
  +          description="--> cvslayout setup">
       <antcall target="build-base"/>
       <antcall target="name-project-conf-files"/>
       <antcall target="turbine-resources"/>
       <antcall target="message"/>
  -    <antcall target="setup-webinf"/>    
  +    <antcall target="setup-webinf"/>
     </target>
  -  
  +
  +  <!-- =================================================================== -->
  +  <!-- C V S L A Y O U T   P R O P E R T I E S                             -->
  +  <!-- =================================================================== -->
     <target name="cvslayout-properties">
       <property file="tdk/build-cvslayout.properties"/>
     </target>
   
  -  <target 
  -    name="build-base">
  -    
  +  <!-- =================================================================== -->
  +  <!-- B U I L D   B A S E                                                 -->
  +  <!-- =================================================================== -->
  +  <target name="build-base">
       <antcall target="webapp-structure"/>
       <antcall target="application-template"/>
     </target>
  @@ -70,17 +70,15 @@
     <!-- =================================================================== -->
     <!-- S A M P L E  A P P L I C A T I O N                                  -->
     <!-- =================================================================== -->
  -  
  -  <target 
  -    name="application" 
  -    depends="setup,properties">
  -    
  +  <target name="application"
  +          depends="setup,properties"
  +          description="--> application setup">
       <antcall target="build-base"/>
       <antcall target="adjust-for-classic"/>
       <antcall target="name-project-conf-files"/>
       <antcall target="turbine-resources"/>
       <antcall target="message"/>
  -    <antcall target="setup-webinf"/>    
  +    <antcall target="setup-webinf"/>
     </target>
   
     <target name="setup-webinf">
  @@ -91,62 +89,62 @@
     </target>
   
     <target name="adjust-for-classic">
  -    
  +
       <!-- Now we have to make some adjustments to have the exact
            same setup that we had before so people who are familiar
            with the sample app can continue to play with it. -->
  -         
  +
       <!-- Move build files into the WEB-INF/build directory -->
  -    
  +
       <mkdir dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"/>
  -    
  -    <move 
  -      file="${tdk.home}/webapps/${tdk.project}/build.properties" 
  +
  +    <move
  +      file="${tdk.home}/webapps/${tdk.project}/build.properties"
         todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
       />
  -    
  -    <move 
  -      file="${tdk.home}/webapps/${tdk.project}/build.xml" 
  +
  +    <move
  +      file="${tdk.home}/webapps/${tdk.project}/build.xml"
         todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
       />
   
  -    <move 
  -      file="${tdk.home}/webapps/${tdk.project}/project.properties" 
  +    <move
  +      file="${tdk.home}/webapps/${tdk.project}/project.properties"
         todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
       />
  -    
  -    <move 
  -      file="${tdk.home}/webapps/${tdk.project}/project-build.xml" 
  +
  +    <move
  +      file="${tdk.home}/webapps/${tdk.project}/project-build.xml"
         todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
       />
   
  -    <move 
  -      file="${tdk.home}/webapps/${tdk.project}/GETTING_STARTED.txt" 
  +    <move
  +      file="${tdk.home}/webapps/${tdk.project}/GETTING_STARTED.txt"
         todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build"
       />
  -    
  +
       <!-- Move src/conf into WEB-INF/conf -->
  -    
  +
       <mkdir dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/conf"/>
  -    
  +
       <move todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/conf">
         <fileset dir="${tdk.home}/webapps/${tdk.project}/src/conf"/>
       </move>
  -    
  +
       <!-- Move src/java into WEB-INF/src/java -->
  -    
  +
       <move todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/src">
         <fileset dir="${tdk.home}/webapps/${tdk.project}/src"/>
       </move>
     </target>
   
     <target name="name-project-conf-files">
  -    <!-- 
  +    <!--
         Little hack to make the project schema come out
         with the name of the app provided.
  -    -->             
  +    -->
   
  -    <move 
  +    <move
         file="${app.conf}/project-schema.xml"
         tofile="${app.conf}/${tdk.project}-schema.xml"
       />
  @@ -161,7 +159,7 @@
       <!-- =================================================================== -->
   
       <echo>
  -      
  +
         There are few things that you must do before
         you can run the sample application. Everything
         will be done for you automatically, but you must
  @@ -173,9 +171,9 @@
         provided and the whole sample app will be setup for you!.
   
         Detailed instructions on how to precede are outlined
  -      outlined in the GETTING_STARTED.txt located in the
  +      in the GETTING_STARTED.txt located in the
         webapps/${tdk.project}/WEB-INF/build directory
  -    
  +
       </echo>
   
     </target>
  @@ -211,7 +209,7 @@
           <exclude name="flux*.jar"/>
         </fileset>
       </copy>
  -  
  +
       <copy todir="${tdk.home}/webapps/${tdk.project}/WEB-INF/lib">
         <fileset dir="${lib.dir}">
           <include name="turbine-${tdk.turbineVersion}*.jar"/>
  @@ -223,9 +221,9 @@
     <!-- ================================================================= -->
     <!-- A P P L I C A T I O N  T E M P L A T E                            -->
     <!-- ================================================================= -->
  -    
  +
     <target name="application-template">
  -    
  +
       <filter token="PROJECT" value="${tdk.project}"/>
       <filter token="TEMPLATE_PATH" value="${template.path}"/>
       <filter token="OUTPUT_DIRECTORY" value="${output.directory}"/>
  @@ -237,7 +235,7 @@
       <filter token="SRC_DIR" value="${src.dir}"/>
       <filter token="CONF_DIR" value="${conf.dir}"/>
       <filter token="TURBINE_VERSION" value="${tdk.turbineVersion}"/>
  -    
  +
       <filter token="DATABASE" value="${database}"/>
       <filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
       <filter token="DATABASE_URL" value="${databaseUrl}"/>
  @@ -246,7 +244,7 @@
       <filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
       <filter token="DATABASE_HOST" value="${databaseHost}"/>
       <filter token="DATABASE_DEFAULT" value="${tdk.project}"/>
  -    
  +
       <copy todir="${app.home}" filtering="yes">
         <fileset dir="${app.src}">
           <exclude name="**/images/**"/>
  @@ -255,7 +253,7 @@
   
       <!-- Images get whacked when copied with filtering
            so we must copy them separately. -->
  -    
  +
       <copy todir="${app.home}">
         <fileset dir="${app.src}">
           <include name="**/images/**"/>
  @@ -268,7 +266,7 @@
            because what will be substituted is the value of
            tdk.home on the machine where the sample app was
            built and packaged. We obviously don't want this. -->
  -    
  +
       <replace dir="${app.home}">
         <include name="**/build.properties"/>
         <replacetoken><![CDATA[@TDK_HOME@]]></replacetoken>
  @@ -277,17 +275,17 @@
   
       <!-- Now we have to adjust the the location of the src files
            to correspond the specified package structure. -->
  -         
  +
       <move todir="${app.home}/src/java/${target.directory}/modules">
         <fileset dir="${app.home}/src/java/modules"/>
  -    </move>     
  +    </move>
   
     </target>
   
     <!-- ================================================================= -->
     <!-- T E S T  S O U R C E                                              -->
     <!-- ================================================================= -->
  -  
  +
     <target name="test-source">
       <copy todir="${app.src}/test" filtering="yes">
         <fileset dir="${test.directory}"/>
  @@ -304,7 +302,7 @@
       <filter token="APP_ROOT" value="${app.root}"/>
       <filter token="APP_PROPERTIES" value="${app.properties}"/>
   
  -    <copy 
  +    <copy
         file="${ancillary.dir}/web.xml"
         tofile="${tdk.home}/webapps/${tdk.project}/WEB-INF/web.xml"
         overwrite="yes"
  
  
  

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

Reply via email to