Return-Path: 
 <torque-dev-return-4685-apmail-db-torque-dev-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-torque-dev-archive@www.apache.org
Received: (qmail 96763 invoked from network); 27 Oct 2004 14:25:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 27 Oct 2004 14:25:00 -0000
Received: (qmail 26233 invoked by uid 500); 27 Oct 2004 14:24:54 -0000
Delivered-To: apmail-db-torque-dev-archive@db.apache.org
Received: (qmail 26150 invoked by uid 500); 27 Oct 2004 14:24:53 -0000
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:torque-dev-unsubscribe@db.apache.org>
List-Subscribe: <mailto:torque-dev-subscribe@db.apache.org>
List-Help: <mailto:torque-dev-help@db.apache.org>
List-Post: <mailto:torque-dev@db.apache.org>
List-Id: "Apache Torque Developers List" <torque-dev.db.apache.org>
Reply-To: "Apache Torque Developers List" <torque-dev@db.apache.org>
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 26093 invoked by uid 500); 27 Oct 2004 14:24:53 -0000
Received: (qmail 26084 invoked by uid 99); 27 Oct 2004 14:24:53 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 27 Oct 2004 07:24:52 -0700
Received: (qmail 96535 invoked by uid 1332); 27 Oct 2004 14:24:50 -0000
Date: 27 Oct 2004 14:24:50 -0000
Message-ID: <20041027142450.96534.qmail@minotaur.apache.org>
From: henning@apache.org
To: db-torque-cvs@apache.org
Subject: cvs commit: db-torque/src/generator maven.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

henning     2004/10/27 07:24:50

  Modified:    .        Tag: TORQUE_3_1_BRANCH maven.xml
               src/generator Tag: TORQUE_3_1_BRANCH maven.xml
  Log:
  dist code seems no longer necessary for Maven 1.0. In fact, the dist goals
  don't build under Maven 1.0 with this code.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.20.2.3  +1 -72     db-torque/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/maven.xml,v
  retrieving revision 1.20.2.2
  retrieving revision 1.20.2.3
  diff -u -r1.20.2.2 -r1.20.2.3
  --- maven.xml	25 Aug 2004 01:05:59 -0000	1.20.2.2
  +++ maven.xml	27 Oct 2004 14:24:49 -0000	1.20.2.3
  @@ -37,77 +37,6 @@
     <property file="default.properties" />
   
     <!-- ================================================================== -->
  -  <!-- D I S T : B U I L D _ B I N   P R E   G O A L                      -->
  -  <!-- ================================================================== -->
  -  <!-- copies jars, templates, ... to the ${maven.dist.bin.assembly.dir}  -->
  -  <!-- to include them in the binary dists                                -->
  -  <!-- ================================================================== -->
  -  <preGoal name="dist:build-bin">
  -
  -    <!-- copy schema files to the right place -->
  -<!--    
  -    <copy todir="${maven.dist.bin.assembly.dir}/schema">
  -      <fileset dir="${maven.src.dir}/schema" />
  -    </copy>
  --->
  -    <!-- copy master files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/master">
  -      <fileset dir="${maven.src.dir}/conf/master" />
  -    </copy>
  -
  -    <!-- copy config files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}">
  -      <fileset dir="${maven.src.dir}/conf" />
  -    </copy>
  -
  -    <!-- include listed dependencies -->
  -    <deploy:copy-deps todir="${maven.dist.bin.assembly.dir}/lib"/>
  -
  -    <!-- move torque.jar to /lib -->
  -    <move
  -      file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar"
  -      todir="${maven.dist.bin.assembly.dir}/lib"
  -    />
  -  </preGoal>
  -
  -  <!-- ================================================================== -->
  -  <!-- D I S T : L I T E                                                  -->
  -  <!-- ================================================================== -->
  -  <!-- binary distribution without jars used by scarab                    -->
  -  <!-- ================================================================== -->
  -  <goal name="dist:lite"
  -        prereqs="jar:jar"
  -        description="distribution without dependency jars">
  -
  -    <!-- copy schema files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/schema">
  -      <fileset dir="${maven.src.dir}/schema" />
  -    </copy>
  -
  -    <!-- copy master files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/master">
  -      <fileset dir="${maven.src.dir}/conf/master" />
  -    </copy>
  -
  -    <!-- copy config files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}">
  -      <fileset dir="${maven.src.dir}/conf" />
  -    </copy>
  -
  -    <!-- Copy Jars -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/lib">
  -      <fileset dir="${maven.build.dir}">
  -        <include name="${maven.final.name}.jar"/>
  -      </fileset>
  -    </copy>
  -
  -    <!-- Create a zip file -->
  -    <zip zipfile="${maven.build.dir}/${maven.final.name}.zip">
  -      <zipfileset dir="${maven.dist.bin.assembly.dir}"/>
  -    </zip>
  -  </goal>
  -
  -  <!-- ================================================================== -->
     <!-- R U N T I M E T E S T                                              -->
     <!-- ================================================================== -->
     <goal
  
  
  
  No                   revision
  No                   revision
  1.8.2.3   +1 -81     db-torque/src/generator/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/maven.xml,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -r1.8.2.2 -r1.8.2.3
  --- maven.xml	25 Aug 2004 01:05:59 -0000	1.8.2.2
  +++ maven.xml	27 Oct 2004 14:24:49 -0000	1.8.2.3
  @@ -85,86 +85,6 @@
     </postGoal>  
   
     <!-- ================================================================== -->
  -  <!-- D I S T : B U I L D _ B I N   P R E   G O A L                      -->
  -  <!-- ================================================================== -->
  -  <!-- copies jars, templates, ... to the ${maven.dist.bin.assembly.dir}  -->
  -  <!-- to include them in the binary dists                                -->
  -  <!-- ================================================================== -->
  -  <preGoal name="dist:build-bin">
  -    <!-- copy templates to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/templates">
  -      <fileset dir="${maven.src.dir}/templates" />
  -    </copy>
  -
  -    <!-- copy schema files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/schema">
  -      <fileset dir="${maven.src.dir}/schema" />
  -    </copy>
  -
  -    <!-- copy master files to the right place -->
  -<!--    
  -    <copy todir="${maven.dist.bin.assembly.dir}/master">
  -      <fileset dir="${maven.src.dir}/conf/master" />
  -    </copy>
  --->
  -    <!-- copy config files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}">
  -      <fileset dir="${maven.src.dir}/conf" />
  -    </copy>
  -
  -    <!-- include listed dependencies -->
  -    <deploy:copy-deps todir="${maven.dist.bin.assembly.dir}/lib"/>
  -
  -    <!-- move torque.jar to /lib -->
  -    <move
  -      file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar"
  -      todir="${maven.dist.bin.assembly.dir}/lib"
  -    />
  -  </preGoal>
  -
  -  <!-- ================================================================== -->
  -  <!-- D I S T : L I T E                                                  -->
  -  <!-- ================================================================== -->
  -  <!-- binary distribution without jars used by scarab                    -->
  -  <!-- ================================================================== -->
  -  <goal name="dist:lite"
  -        prereqs="jar:jar"
  -        description="distribution without dependency jars">
  -
  -    <!-- copy templates to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/templates">
  -      <fileset dir="${maven.src.dir}/templates" />
  -    </copy>
  -
  -    <!-- copy schema files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/schema">
  -      <fileset dir="${maven.src.dir}/schema" />
  -    </copy>
  -
  -    <!-- copy master files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/master">
  -      <fileset dir="${maven.src.dir}/conf/master" />
  -    </copy>
  -
  -    <!-- copy config files to the right place -->
  -    <copy todir="${maven.dist.bin.assembly.dir}">
  -      <fileset dir="${maven.src.dir}/conf" />
  -    </copy>
  -
  -    <!-- Copy Jars -->
  -    <copy todir="${maven.dist.bin.assembly.dir}/lib">
  -      <fileset dir="${maven.build.dir}">
  -        <include name="${maven.final.name}.jar"/>
  -      </fileset>
  -    </copy>
  -
  -    <!-- Create a zip file -->
  -    <zip zipfile="${maven.build.dir}/${maven.final.name}.zip">
  -      <zipfileset dir="${maven.dist.bin.assembly.dir}"/>
  -    </zip>
  -  </goal>
  -
  -  <!-- ================================================================== -->
     <!-- R U N T I M E T E S T                                              -->
     <!-- ================================================================== -->
     <goal
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org