Author: sppatel
Date: Mon Jan 9 10:32:49 2006
New Revision: 367354
URL: http://svn.apache.org/viewcvs?rev=367354&view=rev
Log:
allow each plugin and feature to be version seperately
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml
geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.installableruntime.feature/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.feature.source/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/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=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml Mon Jan 9 10:32:49
2006
@@ -45,58 +45,64 @@
<ant:delete dir="${distribution.dir.temp}"/>
<ant:echo>Packaging feature for zip distribution</ant:echo>
<j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="dependency" value="${artifact.dependency}"/>
+ <j:set var="dependency" value="${artifact.dependency}"/>
+ <pathconvert property="version" targetos="unix">
+ <path path="${dependency.version}"/>
+ <chainedmapper>
+ <flattenmapper/>
+ <globmapper from="*-SNAPSHOT" to="*"/>
+ </chainedmapper>
+ </pathconvert>
<j:if test="${dependency.getProperty('zipdistro') == 'true'}">
<echo>Processing ${dependency.artifactId}</echo>
<j:if test="${dependency.getProperty('feature') == 'true'}">
- <ant:unjar src="${artifact.path}" dest="${distribution.dir.temp}/features/${dependency.artifactId}_${distributionjarversion}"/>
+ <ant:unjar src="${artifact.path}" dest="${distribution.dir.temp}/features/${dependency.artifactId}_${version}"/>
</j:if>
<j:if test="${dependency.getProperty('jar') == 'true'}">
- <ant:copy file="${artifact.path}" tofile="${distribution.dir.temp}/plugins/${dependency.artifactId}_${distributionjarversion}.jar"
overwrite="true"/>
+ <ant:copy file="${artifact.path}" tofile="${distribution.dir.temp}/plugins/${dependency.artifactId}_${version}.jar"
overwrite="true"/>
</j:if>
<j:if test="${dependency.getProperty('jar') == 'false'}">
- <ant:unjar src="${artifact.path}" dest="${distribution.dir.temp}/plugins/${dependency.artifactId}_${distributionjarversion}"/>
+ <ant:unjar src="${artifact.path}" dest="${distribution.dir.temp}/plugins/${dependency.artifactId}_${version}"/>
</j:if>
</j:if>
</j:forEach>
- <ant:zip destfile="${distribution.dir}/geronimo-eclipse-plugin-${pom.currentVersion}.zip"
basedir="${distribution.dir.temp}"/>
- <checksum file="${distribution.dir}/geronimo-eclipse-plugin-${pom.currentVersion}.zip"
algorithm="MD5" fileext=".md5"/>
- <checksum file="${distribution.dir}/geronimo-eclipse-plugin-${pom.currentVersion}.zip"
algorithm="SHA" fileext=".sha"/>
+ <ant:zip destfile="${distribution.dir}/geronimo-eclipse-plugin-${zipdistribution_version}.zip"
basedir="${distribution.dir.temp}"/>
+ <checksum file="${distribution.dir}/geronimo-eclipse-plugin-${zipdistribution_version}.zip"
algorithm="MD5" fileext=".md5"/>
+ <checksum file="${distribution.dir}/geronimo-eclipse-plugin-${zipdistribution_version}.zip"
algorithm="SHA" fileext=".sha"/>
</goal>
<goal name="sitedistro" prereqs="init">
<ant:echo>Packaging feature for update site</ant:echo>
<ant:delete dir="${distribution.dir}/updates"/>
<j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="dependency" value="${artifact.dependency}"/>
-
+ <j:set var="dependency" value="${artifact.dependency}"/>
+ <pathconvert property="version" targetos="unix">
+ <path path="${dependency.version}"/>
+ <chainedmapper>
+ <flattenmapper/>
+ <globmapper from="*-SNAPSHOT" to="*"/>
+ </chainedmapper>
+ </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}_${distributionjarversion}.jar"
overwrite="true"/>
- <checksum file="${distribution.dir.updatesite}/features/${dependency.artifactId}_${distributionjarversion}.jar"
algorithm="MD5" fileext=".md5" />
- <checksum file="${distribution.dir.updatesite}/features/${dependency.artifactId}_${distributionjarversion}.jar"
algorithm="SHA" fileext=".sha"/>
+ <ant:copy file="${artifact.path}" tofile="${distribution.dir.updatesite}/features/${dependency.artifactId}_${version}.jar"
overwrite="true"/>
+ <checksum file="${distribution.dir.updatesite}/features/${dependency.artifactId}_${version}.jar"
algorithm="MD5" fileext=".md5" />
+ <checksum file="${distribution.dir.updatesite}/features/${dependency.artifactId}_${version}.jar"
algorithm="SHA" fileext=".sha"/>
</j:if>
<j:if test="${dependency.getProperty('jar') == 'true' || dependency.getProperty('jar')
== 'false'}">
<echo>Processing ${dependency.artifactId}</echo>
- <ant:copy file="${artifact.path}" tofile="${distribution.dir.updatesite}/plugins/${dependency.artifactId}_${distributionjarversion}.jar"
overwrite="true"/>
- <checksum file="${distribution.dir.updatesite}/plugins/${dependency.artifactId}_${distributionjarversion}.jar"
algorithm="MD5" fileext=".md5"/>
- <checksum file="${distribution.dir.updatesite}/plugins/${dependency.artifactId}_${distributionjarversion}.jar"
algorithm="SHA" fileext=".sha"/>
+ <ant:copy file="${artifact.path}" tofile="${distribution.dir.updatesite}/plugins/${dependency.artifactId}_${version}.jar"
overwrite="true"/>
+ <checksum file="${distribution.dir.updatesite}/plugins/${dependency.artifactId}_${version}.jar"
algorithm="MD5" fileext=".md5"/>
+ <checksum file="${distribution.dir.updatesite}/plugins/${dependency.artifactId}_${version}.jar"
algorithm="SHA" fileext=".sha"/>
</j:if>
</j:forEach>
<echo>Getting site.xml</echo>
<ant:exec dir="${basedir}" executable="svn" output="${distribution.dir.updatesite}/site.xml">
<ant:arg line="cat https://svn.apache.org/repos/asf/geronimo/site/docs/devtools/site.xml"/>
- </ant:exec>
- <!-- <attainGoal name="sitedistrozip"/> -->
+ </ant:exec>
</goal>
-
- <goal name="sitedistrozip">
- <ant:zip destfile="${distribution.dir}/geronimo-update-${pom.currentVersion}.zip"
basedir="${maven.build.dir}"/>
- <checksum file="${distribution.dir}/geronimo-update-${pom.currentVersion}.zip"
algorithm="MD5" fileext=".md5"/>
- <checksum file="${distribution.dir}/geronimo-update-${pom.currentVersion}.zip"
algorithm="SHA" fileext=".sha"/>
- </goal>
-
+
</project>
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=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml Mon Jan 9 10:32:49
2006
@@ -23,7 +23,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.devtools.eclipse.core</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.devtools.eclipse.core_version}</version>
<properties>
<jar>true</jar>
<zipdistro>true</zipdistro>
@@ -32,7 +32,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.deployment.model_version}</version>
<properties>
<jar>true</jar>
<zipdistro>true</zipdistro>
@@ -41,7 +41,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model.edit</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.deployment.model.edit_version}</version>
<properties>
<jar>true</jar>
<zipdistro>true</zipdistro>
@@ -50,7 +50,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.feature</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.feature_version}</version>
<properties>
<feature>true</feature>
<zipdistro>true</zipdistro>
@@ -59,7 +59,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.installableruntime.feature</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.installableruntime.feature_version}</version>
<properties>
<feature>true</feature>
</properties>
@@ -67,7 +67,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.source.feature</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.source.feature_version}</version>
<properties>
<feature>true</feature>
<zipdistro>true</zipdistro>
@@ -76,7 +76,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.runtime.v1</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.runtime.v1_version}</version>
<properties>
<jar>false</jar>
<zipdistro>true</zipdistro>
@@ -85,7 +85,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.j2ee.server.v1</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.j2ee.server.v1_version}</version>
<properties>
<jar>true</jar>
</properties>
@@ -93,7 +93,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.ui</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.ui_version}</version>
<properties>
<jar>true</jar>
<zipdistro>true</zipdistro>
@@ -102,7 +102,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.feature.source</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.feature.source_version}</version>
<properties>
<jar>false</jar>
<zipdistro>true</zipdistro>
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=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties Mon Jan 9 10:32:49
2006
@@ -17,12 +17,33 @@
maven.eclipse.projectnatures=org.eclipse.pde.PluginNature
maven.eclipse.conclasspath=org.eclipse.pde.core.requiredPlugins
-maven.jar.override=on
+#####################################################
+# Non Plugin Component Versions
+#####################################################
+geronimo_emf_version=0.5.0-SNAPSHOT
+zipdistribution_version=0.5.0-SNAPSHOT
+
+#####################################################
+# Plugin Versions
+#####################################################
+org.apache.geronimo.deployment.model_version=0.5.0-SNAPSHOT
+org.apache.geronimo.deployment.model.edit_version=0.5.0-SNAPSHOT
+org.apache.geronimo.devtools.eclipse.core_version=0.5.0-SNAPSHOT
+org.apache.geronimo.feature.source_version=0.5.0-SNAPSHOT
+org.apache.geronimo.j2ee.server.v1_version=0.5.0-SNAPSHOT
+org.apache.geronimo.runtime.v1_version=0.5.0-SNAPSHOT
+org.apache.geronimo.ui_version=0.5.0-SNAPSHOT
-distributionjarversion=0.5.0
-devtools_currentversion=${distributionjarversion}-SNAPSHOT
+#####################################################
+# Feature Versions
+#####################################################
+org.apache.geronimo.feature_version=0.5.0-SNAPSHOT
+org.apache.geronimo.source.feature_version=0.5.0-SNAPSHOT
+org.apache.geronimo.installableruntime.feature_version=0.5.0-SNAPSHOT
-#dependency versions
+#####################################################
+# Jar Dependency Versions
+#####################################################
geronimo.version=1.0
geronimo_runtime_version=${geronimo.version}
geronimo_spec_version=1.1-rc4
@@ -31,6 +52,14 @@
cglib_version=2.1_3
openejb_version=2.0
+#####################################################
+# Enable jar overrides for all eclipse dependencies
+#####################################################
+maven.jar.override=on
+
+#####################################################
+# Jar Overrides for Eclipse Dependencies
+#####################################################
eclipse.version=3.1.1
wtp.version=1.0.0
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml Mon Jan 9 10:32:49 2006
@@ -19,7 +19,6 @@
<pomVersion>3</pomVersion>
<id>etc</id>
<name>etc</name>
- <currentVersion>${devtools_currentversion}</currentVersion>
<groupId>geronimo-devtools</groupId>
<organization>
<name>Apache Software Foundation</name>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature.source/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.source.feature</id>
<name>org.apache.geronimo.source.feature</name>
+ <currentVersion>${org.apache.geronimo.source.feature_version}</currentVersion>
<build>
<resources>
<resource>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.feature/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.feature</id>
<name>org.apache.geronimo.feature</name>
+ <currentVersion>${org.apache.geronimo.feature_version}</currentVersion>
<build>
<resources>
<resource>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.installableruntime.feature/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.installableruntime.feature/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.installableruntime.feature/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/features/org.apache.geronimo.installableruntime.feature/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.installableruntime.feature</id>
<name>org.apache.geronimo.installableruntime.feature</name>
+ <currentVersion>${org.apache.geronimo.installableruntime.feature_version}</currentVersion>
<build>
<resources>
<resource>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/project.xml Mon Jan 9 10:32:49
2006
@@ -19,6 +19,7 @@
<extend>../etc/project.xml</extend>
<id>geronimo-emf</id>
<name>geronimo-emf</name>
+ <currentVersion>${geronimo_emf_version}</currentVersion>
<dependencies>
<dependency>
<groupId>xerces</groupId>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.deployment.model.edit</id>
<name>org.apache.geronimo.deployment.model.edit</name>
+ <currentVersion>${org.apache.geronimo.deployment.model.edit_version}</currentVersion>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
@@ -46,7 +47,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.deployment.model_version}</version>
</dependency>
<!-- eclipse dependencies -->
<dependency>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.deployment.model</id>
<name>org.apache.geronimo.deployment.model</name>
+ <currentVersion>${org.apache.geronimo.deployment.model_version}</currentVersion>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
@@ -46,7 +47,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>geronimo-emf</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${geronimo_emf_version}</version>
</dependency>
<!-- eclipse dependencies -->
<dependency>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.devtools.eclipse.core</id>
<name>org.apache.geronimo.devtools.eclipse.core</name>
+ <currentVersion>${org.apache.geronimo.devtools.eclipse.core_version}</currentVersion>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
@@ -132,7 +133,7 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.deployment.model_version}</version>
</dependency>
<!-- eclipse dependencies -->
<dependency>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.feature.source/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.feature.source/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.feature.source/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.feature.source/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.feature.source</id>
<name>org.apache.geronimo.feature.source</name>
+ <currentVersion>${org.apache.geronimo.feature.source_version}</currentVersion>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
@@ -46,17 +47,22 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.deployment.model_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-devtools</groupId>
+ <artifactId>org.apache.geronimo.deployment.model.edit</artifactId>
+ <version>${org.apache.geronimo.deployment.model.edit_version}</version>
</dependency>
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.devtools.eclipse.core</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.devtools.eclipse.core_version}</version>
</dependency>
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.ui</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.ui_version}</version>
</dependency>
</dependencies>
</project>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.j2ee.server.v1</id>
<name>org.apache.geronimo.j2ee.server.v1</name>
+ <currentVersion>${org.apache.geronimo.j2ee.server.v1_version}</currentVersion>
<build>
<resources>
<resource>
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=367354&r1=367353&r2=367354&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
Mon Jan 9 10:32:49 2006
@@ -58,8 +58,16 @@
classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"
classpathref="maven.dependency.classpath"/>
<ant:property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.JakartaOroRegexp"/>
+
+ <pathconvert property="plugin-version" targetos="unix">
+ <path path="${pom.currentVersion}"/>
+ <chainedmapper>
+ <flattenmapper/>
+ <globmapper from="*-SNAPSHOT" to="*"/>
+ </chainedmapper>
+ </pathconvert>
- <replaceregexp file="plugin.xml" match="@runtime.v1.plugin.version@" replace="${distributionjarversion}"
byline="true"/>
+ <replaceregexp file="plugin.xml" match="@runtime.v1.plugin.version@" replace="${plugin-version}"
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"/>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.runtime.v1</id>
<name>org.apache.geronimo.runtime.v1</name>
+ <currentVersion>${org.apache.geronimo.runtime.v1_version}</currentVersion>
<build>
<resources>
<resource>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml?rev=367354&r1=367353&r2=367354&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/project.xml
Mon Jan 9 10:32:49 2006
@@ -19,6 +19,7 @@
<extend>../../etc/project.xml</extend>
<id>org.apache.geronimo.ui</id>
<name>org.apache.geronimo.ui</name>
+ <currentVersion>${org.apache.geronimo.ui_version}</currentVersion>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
@@ -61,17 +62,17 @@
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.devtools.eclipse.core</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.devtools.eclipse.core_version}</version>
</dependency>
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.deployment.model_version}</version>
</dependency>
<dependency>
<groupId>geronimo-devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model.edit</artifactId>
- <version>${devtools_currentversion}</version>
+ <version>${org.apache.geronimo.deployment.model.edit_version}</version>
</dependency>
<!-- eclipse dependencies -->
<dependency>
|