geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r367653 - in /geronimo/devtools/trunk/modules/eclipse-plugin: assembly/maven.xml plugins/org.apache.geronimo.runtime.v1/maven.xml
Date Tue, 10 Jan 2006 15:44:24 GMT
Author: sppatel
Date: Tue Jan 10 07:44:22 2006
New Revision: 367653

URL: http://svn.apache.org/viewcvs?rev=367653&view=rev
Log:
GERONIMODEVTOOLS-36 again

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml
    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=367653&r1=367652&r2=367653&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml Tue Jan 10 07:44:22
2006
@@ -46,12 +46,14 @@
         <ant:echo>Packaging feature for zip distribution</ant:echo>
         <j:forEach var="artifact" items="${pom.artifacts}">        
             <j:set var="dependency" value="${artifact.dependency}"/>  
-            <pathconvert property="version">
-                <path path="${dependency.version}"/>
-                <chainedmapper>
-                    <flattenmapper/>
-                    <globmapper from="*-SNAPSHOT" to="*"/>
-                </chainedmapper>
+            <pathconvert property="version" targetos="unix">
+                <path path="${artifact.dependency.version}"/>
+                <mapper>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*-SNAPSHOT" to="*"/>
+                    </chainedmapper>
+                </mapper>
             </pathconvert>      
             <j:if test="${dependency.getProperty('zipdistro') == 'true'}">
                 <echo>Processing ${dependency.artifactId}</echo>  
@@ -78,13 +80,15 @@
         <ant:delete dir="${distribution.dir}/updates"/>
         <j:forEach var="artifact" items="${pom.artifacts}">        
             <j:set var="dependency" value="${artifact.dependency}"/>  
-            <pathconvert property="version">
-                <path path="${dependency.version}"/>
-                <chainedmapper>
-                    <flattenmapper/>
-                    <globmapper from="*-SNAPSHOT" to="*"/>
-                </chainedmapper>
-            </pathconvert>         
+           <pathconvert property="version" targetos="unix">
+                <path path="${artifact.dependency.version}"/>
+                <mapper>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*-SNAPSHOT" to="*"/>
+                    </chainedmapper>
+                </mapper>
+            </pathconvert>      
             <j:if test="${dependency.getProperty('feature') == 'true'}">
                 <echo>Processing ${dependency.artifactId}</echo>  
                 <ant:copy file="${artifact.path}" tofile="${distribution.dir.updatesite}/features/${dependency.artifactId}_${version}.jar"
overwrite="true"/>

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=367653&r1=367652&r2=367653&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
Tue Jan 10 07:44:22 2006
@@ -61,10 +61,15 @@
       
       <pathconvert property="plugin_version">
         <path path="${pom.currentVersion}"/>
-        <chainedmapper>
-            <flattenmapper/>
-            <globmapper from="*-SNAPSHOT" to="*"/>
-        </chainedmapper>
+         <pathconvert property="version" targetos="unix">
+                <path path="${artifact.dependency.version}"/>
+                <mapper>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*-SNAPSHOT" to="*"/>
+                    </chainedmapper>
+                </mapper>
+        </pathconvert>      
       </pathconvert>
     	
       <replaceregexp file="plugin.xml" match="@runtime.v1.plugin.version@" replace="${plugin_version}"
byline="true"/>



Mime
View raw message