You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/10/09 21:22:46 UTC
svn commit: r454467 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: ./
org.apache.geronimo.common.deployment.model.edit/
org.apache.geronimo.common.deployment.model/
org.apache.geronimo.deployment.model.edit/
org.apache.geronimo.deployment.model/...
Author: sppatel
Date: Mon Oct 9 12:22:45 2006
New Revision: 454467
URL: http://svn.apache.org/viewvc?view=rev&rev=454467
Log:
cannot use filter to add qualifier due to eclipse issue with ${ in version id, use ant task replace instead
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml Mon Oct 9 12:22:45 2006
@@ -17,11 +17,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -49,6 +44,9 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
<!-- workaround for bugzilla 147936 -->
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml Mon Oct 9 12:22:45 2006
@@ -19,11 +19,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -44,6 +39,9 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
<!-- workaround for bugzilla 147936 -->
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml Mon Oct 9 12:22:45 2006
@@ -16,11 +16,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -48,6 +43,9 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
<!-- workaround for bugzilla 147936 -->
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml Mon Oct 9 12:22:45 2006
@@ -20,11 +20,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -45,6 +40,9 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
<!-- workaround for bugzilla 147936 -->
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Mon Oct 9 12:22:45 2006
@@ -18,11 +18,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -45,6 +40,9 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml Mon Oct 9 12:22:45 2006
@@ -17,11 +17,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -44,6 +39,9 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml Mon Oct 9 12:22:45 2006
@@ -17,11 +17,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -44,6 +39,9 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml Mon Oct 9 12:22:45 2006
@@ -13,11 +13,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>.options</include>
@@ -59,6 +54,9 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml Mon Oct 9 12:22:45 2006
@@ -13,11 +13,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -56,6 +51,9 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml Mon Oct 9 12:22:45 2006
@@ -13,11 +13,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -35,6 +30,9 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml Mon Oct 9 12:22:45 2006
@@ -13,11 +13,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -42,6 +37,9 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml Mon Oct 9 12:22:45 2006
@@ -13,11 +13,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -35,6 +30,9 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml Mon Oct 9 12:22:45 2006
@@ -13,11 +13,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -42,6 +37,9 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml Mon Oct 9 12:22:45 2006
@@ -20,11 +20,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -49,6 +44,9 @@
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml Mon Oct 9 12:22:45 2006
@@ -20,11 +20,6 @@
<build>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>META-INF</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
@@ -42,6 +37,9 @@
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?view=diff&rev=454467&r1=454466&r2=454467
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Mon Oct 9 12:22:45 2006
@@ -52,10 +52,27 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.directory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy file="${basedir}/META-INF/MANIFEST.MF" todir="${project.build.directory}/META-INF" overwrite="true"/>
+ <replace file="${project.build.directory}/META-INF/MANIFEST.MF" token="qualifier" value="${qualifier}"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>