geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r365655 - in /geronimo/devtools/trunk/modules/eclipse-plugin/assembly: maven.xml project.xml
Date Tue, 03 Jan 2006 15:01:20 GMT
Author: sppatel
Date: Tue Jan  3 07:01:18 2006
New Revision: 365655

URL: http://svn.apache.org/viewcvs?rev=365655&view=rev
Log:
GERONIMODEVTOOLS-30

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=365655&r1=365654&r2=365655&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml Tue Jan  3 07:01:18
2006
@@ -45,19 +45,18 @@
         <ant:echo>Packaging feature for zip distribution</ant:echo>    
         <j:forEach var="artifact" items="${pom.artifacts}">        
             <j:set var="dependency" value="${artifact.dependency}"/>           
+            <j:if test="${dependency.getProperty('zipdistro') == 'true'}">
+                <j:if test="${dependency.getProperty('feature') == 'true'}">  
+                    <ant:unjar src="${artifact.path}" dest="${distribution.dir.temp}/features/${dependency.artifactId}_${distributionjarversion}"/>
+                </j:if> 
             
-            <j:if test="${dependency.getProperty('feature') == 'true'}">  
-                <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> 
             
-            <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'}">  
-                <ant:unjar src="${artifact.path}" dest="${distribution.dir.temp}/plugins/${dependency.artifactId}_${distributionjarversion}"/>
+                <j:if test="${dependency.getProperty('jar') == 'false'}">  
+                    <ant:unjar src="${artifact.path}" dest="${distribution.dir.temp}/plugins/${dependency.artifactId}_${distributionjarversion}"/>
+                </j:if>   
             </j:if>                        
         </j:forEach>               
         <ant:zip destfile="${distribution.dir}/geronimo-eclipse-plugin-${pom.currentVersion}.zip"
basedir="${distribution.dir.temp}"/> 

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=365655&r1=365654&r2=365655&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml Tue Jan  3 07:01:18
2006
@@ -26,6 +26,7 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <jar>true</jar>
+        <zipdistro>true</zipdistro>
       </properties>
     </dependency>
     <dependency>
@@ -34,6 +35,7 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <jar>true</jar>
+        <zipdistro>true</zipdistro>
       </properties>
     </dependency>
     <dependency>
@@ -42,6 +44,7 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <jar>true</jar>
+        <zipdistro>true</zipdistro>
       </properties>
     </dependency>
     <dependency>
@@ -50,6 +53,7 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <feature>true</feature>
+        <zipdistro>true</zipdistro>
       </properties>
     </dependency>
      <dependency>
@@ -66,6 +70,7 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <feature>true</feature>
+        <zipdistro>true</zipdistro>
       </properties>
     </dependency>
     <dependency>
@@ -74,6 +79,7 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <jar>false</jar>
+        <zipdistro>true</zipdistro>
       </properties>
     </dependency>
     <dependency>
@@ -90,6 +96,7 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <jar>true</jar>
+        <zipdistro>true</zipdistro>
       </properties>
     </dependency>
     <dependency>
@@ -98,6 +105,7 @@
       <version>${devtools_currentversion}</version>
       <properties>
         <jar>false</jar>
+        <zipdistro>true</zipdistro>
       </properties>
     </dependency>
   </dependencies>



Mime
View raw message