You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/14 05:38:46 UTC
svn commit: r421794 - in /geronimo/sandbox/svkmerge/m2migration: configs/
configs/activemq/ configs/client-corba/ configs/client-security/
configs/client-system/ configs/console-jetty/ configs/console-tomcat/
configs/geronimo-gbean-deployer/ configs/j2...
Author: jdillon
Date: Thu Jul 13 20:38:45 2006
New Revision: 421794
URL: http://svn.apache.org/viewvc?rev=421794&view=rev
Log:
Use consolidated car-maven-plugin
Removed:
geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/
geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/
Modified:
geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml Thu Jul 13 20:38:45 2006
@@ -63,7 +63,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml Thu Jul 13 20:38:45 2006
@@ -63,7 +63,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml Thu Jul 13 20:38:45 2006
@@ -76,7 +76,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml Thu Jul 13 20:38:45 2006
@@ -63,9 +63,9 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<classPath>
<element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml Thu Jul 13 20:38:45 2006
@@ -198,7 +198,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml Thu Jul 13 20:38:45 2006
@@ -198,7 +198,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml Thu Jul 13 20:38:45 2006
@@ -70,7 +70,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<boot>true</boot>
</configuration>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml Thu Jul 13 20:38:45 2006
@@ -60,7 +60,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml Thu Jul 13 20:38:45 2006
@@ -87,7 +87,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml Thu Jul 13 20:38:45 2006
@@ -60,7 +60,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<classPath>
<element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml Thu Jul 13 20:38:45 2006
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml Thu Jul 13 20:38:45 2006
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml Thu Jul 13 20:38:45 2006
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml Thu Jul 13 20:38:45 2006
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml Thu Jul 13 20:38:45 2006
@@ -36,7 +36,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<classPath>
<element>../lib/geronimo-deployment-${pom.version}.jar</element>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/pom.xml Thu Jul 13 20:38:45 2006
@@ -73,7 +73,7 @@
<extensions>
<extension>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<version>${pom.version}</version>
</extension>
</extensions>
@@ -83,7 +83,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<version>${pom.version}</version>
<extensions>true</extensions>
</plugin>
@@ -93,7 +93,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<!-- Install as extention to allow 'car' packaging to be used. -->
<extensions>true</extensions>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml Thu Jul 13 20:38:45 2006
@@ -70,7 +70,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml Thu Jul 13 20:38:45 2006
@@ -70,7 +70,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml Thu Jul 13 20:38:45 2006
@@ -36,7 +36,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<classPath>
<element>../lib/geronimo-deploy-tool-${pom.version}.jar</element>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml Thu Jul 13 20:38:45 2006
@@ -102,7 +102,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml Thu Jul 13 20:38:45 2006
@@ -63,7 +63,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml Thu Jul 13 20:38:45 2006
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml Thu Jul 13 20:38:45 2006
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml Thu Jul 13 20:38:45 2006
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml Thu Jul 13 20:38:45 2006
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml Thu Jul 13 20:38:45 2006
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Thu Jul 13 20:38:45 2006
@@ -609,11 +609,11 @@
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-assembly-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<executions>
<execution>
- <id>installConfig</id>
- <phase>test</phase>
+ <id>install-config</id>
+ <phase>package</phase>
<goals>
<goal>installConfig</goal>
</goals>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml Thu Jul 13 20:38:45 2006
@@ -609,7 +609,7 @@
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-assembly-plugin</artifactId>
+ <artifactId>car-maven-plugin</artifactId>
<executions>
<execution>
<id>installConfig</id>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml Thu Jul 13 20:38:45 2006
@@ -10,9 +10,9 @@
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
<configuration>
<phases>
- <process-resources>org.apache.geronimo.plugins:geronimo-packaging-plugin:dependencies</process-resources>
+ <process-resources>org.apache.geronimo.plugins:car-maven-plugin:dependencies</process-resources>
<compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
- <package>org.apache.geronimo.plugins:geronimo-packaging-plugin:package</package>
+ <package>org.apache.geronimo.plugins:car-maven-plugin:package</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
</phases>
</configuration>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml?rev=421794&r1=421793&r2=421794&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml Thu Jul 13 20:38:45 2006
@@ -68,8 +68,7 @@
</build>
<modules>
- <module>geronimo-packaging-plugin</module>
- <module>geronimo-assembly-plugin</module>
+ <module>car-maven-plugin</module>
<module>geronimo-deployment-plugin</module>
</modules>