db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r239573 - in /db/torque/generator/trunk: maven.xml project.xml
Date Wed, 24 Aug 2005 08:53:56 GMT
Author: henning
Date: Wed Aug 24 01:53:52 2005
New Revision: 239573

URL: http://svn.apache.org/viewcvs?rev=239573&view=rev
Log:
add a "dist.bundle" property which makes it possible to select the
elements going into the binary distribution with a property in the
POM, thus removing the necessity to hard code them in maven.xml


Modified:
    db/torque/generator/trunk/maven.xml
    db/torque/generator/trunk/project.xml

Modified: db/torque/generator/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/maven.xml?rev=239573&r1=239572&r2=239573&view=diff
==============================================================================
--- db/torque/generator/trunk/maven.xml (original)
+++ db/torque/generator/trunk/maven.xml Wed Aug 24 01:53:52 2005
@@ -27,6 +27,7 @@
 
 <project
   xmlns:pom="pom"
+  xmlns:j="jelly:core"
   xmlns:deploy="deploy"
   default="jar:jar">
 
@@ -52,8 +53,13 @@
   <!-- ================================================================== -->
   <preGoal name="dist:build-bin">
     <!-- include listed dependencies -->
-    <deploy:copy-deps todir="${maven.dist.bin.assembly.dir}/lib" excludes="jndi:jndi,jdbc"
/>
-    
+    <j:forEach var="dep" items="${pom.dependencies}">
+      <j:if test="${dep.getProperty('dist.bundle') != null &amp;&amp; dep.getProperty('dist.bundle').equalsIgnoreCase('true')}">
+        <copy todir="${maven.dist.bin.assembly.dir}/lib"
+              file="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
+      </j:if>
+    </j:forEach>
+
     <!--copy build-torque.xml to the right place -->
     <copy 
       file="${maven.src.dir}/conf/build-torque.xml"

Modified: db/torque/generator/trunk/project.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/project.xml?rev=239573&r1=239572&r2=239573&view=diff
==============================================================================
--- db/torque/generator/trunk/project.xml (original)
+++ db/torque/generator/trunk/project.xml Wed Aug 24 01:53:52 2005
@@ -41,6 +41,9 @@
       <groupId>ant</groupId>
       <version>1.6.5</version>
       <url>http://ant.apache.org/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
 
     <dependency>
@@ -48,6 +51,9 @@
       <groupId>commons-collections</groupId>
       <version>3.1</version>
       <url>http://jakarta.apache.org/commons/collections/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
 
     <dependency>
@@ -55,6 +61,9 @@
       <groupId>commons-lang</groupId>
       <version>2.1</version>
       <url>http://jakarta.apache.org/commons/lang/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
 
     <dependency>
@@ -62,6 +71,9 @@
       <groupId>commons-logging</groupId>
       <version>1.0.4</version>
       <url>http://jakarta.apache.org/commons/logging/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
 
     <dependency>
@@ -69,6 +81,9 @@
       <groupId>logkit</groupId>
       <version>1.0.1</version>
       <url>http://avalon.apache.org/products/runtime/system/logging/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
 
     <dependency>
@@ -76,6 +91,9 @@
       <artifactId>torque-gen-templates</artifactId>
       <version>3.2-rc2-dev</version>
       <url>http://db.apache.org/torque/generator/templates/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
 
     <dependency>
@@ -83,6 +101,9 @@
       <groupId>velocity</groupId>
       <version>1.3.1</version>
       <url>http://jakarta.apache.org/velocity/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
 
     <dependency>
@@ -90,6 +111,9 @@
       <groupId>village</groupId>
       <version>2.0-dev-20030825</version>
       <url>http://share.whichever.com/index.php?SCREEN=village</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
 
     <dependency>
@@ -97,6 +121,9 @@
       <groupId>xerces</groupId>
       <version>2.6.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>
     
     <dependency>
@@ -104,6 +131,9 @@
       <groupId>xml-apis</groupId>
       <version>2.0.2</version>
       <url>http://xml.apache.org/commons/</url>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
     </dependency>    
 
   </dependencies>



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


Mime
View raw message