geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r292288 - in /geronimo/devtools/trunk/modules/eclipse-plugin: assembly/maven.xml etc/project.properties plugins/org.apache.geronimo.runtime.v1/maven.xml
Date Wed, 28 Sep 2005 20:30:26 GMT
Author: sppatel
Date: Wed Sep 28 13:30:23 2005
New Revision: 292288

URL: http://svn.apache.org/viewcvs?rev=292288&view=rev
Log:
fix plugin.xml version

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.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=292288&r1=292287&r2=292288&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml Wed Sep 28 13:30:23
2005
@@ -28,15 +28,15 @@
             <j:set var="dependency" value="${artifact.dependency}"/>           
             
             <j:if test="${dependency.getProperty('feature') == 'true'}">  
-                <ant:unjar src="${artifact.path}" dest="${feature.assembly.distributions.dir}/features/${dependency.artifactId}_${dependency.version}"/>
+                <ant:unjar src="${artifact.path}" dest="${feature.assembly.distributions.dir}/features/${dependency.artifactId}_${distributionjarversion}"/>
             </j:if> 
             
             <j:if test="${dependency.getProperty('jar') == 'true'}">  
-                <ant:copy file="${artifact.path}" tofile="${feature.assembly.distributions.dir}/plugins/${dependency.artifactId}_${dependency.version}.jar"/>
+                <ant:copy file="${artifact.path}" tofile="${feature.assembly.distributions.dir}/plugins/${dependency.artifactId}_${distributionjarversion}.jar"/>
             </j:if> 
             
             <j:if test="${dependency.getProperty('jar') == 'false'}">  
-                <ant:unjar src="${artifact.path}" dest="${feature.assembly.distributions.dir}/plugins/${dependency.artifactId}_${dependency.version}"/>
+                <ant:unjar src="${artifact.path}" dest="${feature.assembly.distributions.dir}/plugins/${dependency.artifactId}_${distributionjarversion}"/>
             </j:if>                        
         </j:forEach>                 
     </goal>  

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties?rev=292288&r1=292287&r2=292288&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties Wed Sep 28 13:30:23
2005
@@ -6,7 +6,8 @@
 
 maven.jar.override=on
 
-devtools_currentversion=0.5.0-SNAPSHOT
+distributionjarversion=0.5.0
+devtools_currentversion=${distributionjarversion}-SNAPSHOT
 
 #dependency versions
 geronimo.version=1.0-SNAPSHOT

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml?rev=292288&r1=292287&r2=292288&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
Wed Sep 28 13:30:23 2005
@@ -33,7 +33,7 @@
     
     <goal name="createpluginxml">
       <ant:copy file="plugin.xml.template" tofile="plugin.xml" overwrite="true"/>
-      <replaceregexp file="plugin.xml" match="@runtime.v1.plugin.version@" replace="${devtools_currentversion}"
byline="true"/>
+      <replaceregexp file="plugin.xml" match="@runtime.v1.plugin.version@" replace="${distributionjarversion}"
byline="true"/>
       <replaceregexp file="plugin.xml" match="@geronimo_runtime_version@" replace="${geronimo_runtime_version}"
byline="true"/>
       <replaceregexp file="plugin.xml" match="@geronimo_spec_version@" replace="${geronimo_spec_version}"
byline="true"/>
       <replaceregexp file="plugin.xml" match="@mx4j_version@" replace="${mx4j_version}"
byline="true"/>  



Mime
View raw message