geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r355622 - in /geronimo/devtools/trunk/modules/eclipse-plugin/assembly: maven.xml project.xml
Date Fri, 09 Dec 2005 22:55:17 GMT
Author: sppatel
Date: Fri Dec  9 14:55:13 2005
New Revision: 355622

URL: http://svn.apache.org/viewcvs?rev=355622&view=rev
Log:
packaging fixes

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml?rev=355622&r1=355621&r2=355622&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml Fri Dec  9 14:55:13
2005
@@ -17,7 +17,11 @@
 -->
 <project default="default"
     xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant">
+    xmlns:ant="jelly:ant">
+    
+    <goal name="init">
+        <mkdir dir="${distribution.dir}"/>
+    </goal>
 
     <goal name="default">
         <attainGoal name="build"/>
@@ -27,8 +31,7 @@
         <attainGoal name="build"/>
     </goal>
 
-    <goal name="build">
-        <mkdir dir="${distribution.dir}"/>
+    <goal name="build">
         <attainGoal name="zipdistro"/>
         <attainGoal name="sitedistro"/>
     </goal>
@@ -38,7 +41,7 @@
         <attainGoal name="build"/>
     </goal>
 
-    <goal name="zipdistro">   
+    <goal name="zipdistro" prereqs="init">   
         <ant:echo>Packaging feature for zip distribution</ant:echo>    
         <j:forEach var="artifact" items="${pom.artifacts}">        
             <j:set var="dependency" value="${artifact.dependency}"/>           
@@ -47,8 +50,10 @@
                 <ant:unjar src="${artifact.path}" dest="${distribution.dir.temp}/features/${dependency.artifactId}_${distributionjarversion}"/>
             </j:if> 
             
-            <j:if test="${dependency.getProperty('jar') == 'true'}">  
-                <ant:copy file="${artifact.path}" tofile="${distribution.dir.temp}/plugins/${dependency.artifactId}_${distributionjarversion}.jar"/>
+            <j:if test="${dependency.getProperty('jar') == 'true'}">  
+                <j:if test="${!dependency.artifactId.equals('org.apache.geronimo.j2ee.server.v1')}">
+                    <ant:copy file="${artifact.path}" tofile="${distribution.dir.temp}/plugins/${dependency.artifactId}_${distributionjarversion}.jar"/>
+                </j:if>
             </j:if> 
             
             <j:if test="${dependency.getProperty('jar') == 'false'}">  
@@ -60,7 +65,7 @@
         <checksum file="${distribution.dir}/geronimo-eclipse-plugin-${pom.currentVersion}.zip"
algorithm="SHA" fileext=".sha"/>    
     </goal>  
     
-    <goal name="sitedistro">
+    <goal name="sitedistro" prereqs="init">
        <ant:echo>Packaging feature for update site</ant:echo>  
         <j:forEach var="artifact" items="${pom.artifacts}">        
             <j:set var="dependency" value="${artifact.dependency}"/>           

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml?rev=355622&r1=355621&r2=355622&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml Fri Dec  9 14:55:13
2005
@@ -52,6 +52,14 @@
         <feature>true</feature>
       </properties>
     </dependency>
+     <dependency>
+      <groupId>geronimo-devtools</groupId>
+      <artifactId>org.apache.geronimo.installableruntime.feature</artifactId>
+      <version>${devtools_currentversion}</version>
+      <properties>
+        <feature>true</feature>
+      </properties>
+    </dependency>
     <dependency>
       <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.source.feature</artifactId>
@@ -66,6 +74,14 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <jar>false</jar>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>geronimo-devtools</groupId>
+      <artifactId>org.apache.geronimo.j2ee.server.v1</artifactId>
+      <version>${devtools_currentversion}</version>
+      <properties>
+        <jar>true</jar>
       </properties>
     </dependency>
     <dependency>



Mime
View raw message