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 2008/01/20 21:18:47 UTC

svn commit: r613667 [1/3] - in /geronimo/server/trunk: ./ applications/ca-helper/ applications/ca-helper/ca-helper-jetty/ applications/ca-helper/ca-helper-tomcat/ applications/mejb/mejb/ applications/monitoring/ applications/monitoring/agent-ds/ applic...

Author: jdillon
Date: Sun Jan 20 12:18:37 2008
New Revision: 613667

URL: http://svn.apache.org/viewvc?rev=613667&view=rev
Log:
(GERONIMO-3771) Moved maven-plugins/* to buildsupport/*, updated groupId to org.apache.geronimo.buildsupport

Added:
    geronimo/server/trunk/buildsupport/car-maven-plugin/
      - copied from r613642, geronimo/server/trunk/maven-plugins/car-maven-plugin/
    geronimo/server/trunk/buildsupport/geronimo-maven-plugin/
      - copied from r613642, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/
    geronimo/server/trunk/buildsupport/src/
      - copied from r613642, geronimo/server/trunk/maven-plugins/src/
    geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/
      - copied from r613642, geronimo/server/trunk/maven-plugins/testsuite-archetype-plugin/
    geronimo/server/trunk/buildsupport/testsuite-maven-plugin/
      - copied from r613642, geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/
Removed:
    geronimo/server/trunk/maven-plugins/
Modified:
    geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml
    geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml
    geronimo/server/trunk/applications/ca-helper/pom.xml
    geronimo/server/trunk/applications/mejb/mejb/pom.xml
    geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml
    geronimo/server/trunk/applications/monitoring/agent/pom.xml
    geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml
    geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml
    geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml
    geronimo/server/trunk/applications/monitoring/pom.xml
    geronimo/server/trunk/applications/remote-deploy/pom.xml
    geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml
    geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml
    geronimo/server/trunk/applications/sharedlib/pom.xml
    geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml
    geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml
    geronimo/server/trunk/applications/welcome/pom.xml
    geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml
    geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
    geronimo/server/trunk/assemblies/pom.xml
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml
    geronimo/server/trunk/buildsupport/pom.xml
    geronimo/server/trunk/buildsupport/src/site/site.xml
    geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml
    geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml
    geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml
    geronimo/server/trunk/components/spring/pom.xml
    geronimo/server/trunk/components/transformer-agent/pom.xml
    geronimo/server/trunk/components/upgrade/pom.xml
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/jee-specs/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/plugin/pom.xml
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/configs/server-security-config/pom.xml
    geronimo/server/trunk/framework/configs/shutdown/pom.xml
    geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
    geronimo/server/trunk/framework/configs/xmlbeans/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-common/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-core/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-interceptor/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-management/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-naming/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-util/pom.xml
    geronimo/server/trunk/framework/modules/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml
    geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
    geronimo/server/trunk/plugins/axis/axis/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2/pom.xml
    geronimo/server/trunk/plugins/client/client-deployer/pom.xml
    geronimo/server/trunk/plugins/client/client-security/pom.xml
    geronimo/server/trunk/plugins/client/client/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/farming/pom.xml
    geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
    geronimo/server/trunk/plugins/connector/client-transaction/pom.xml
    geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
    geronimo/server/trunk/plugins/connector/transaction/pom.xml
    geronimo/server/trunk/plugins/console/console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
    geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
    geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml
    geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
    geronimo/server/trunk/plugins/hotdeploy/hot-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper/pom.xml
    geronimo/server/trunk/plugins/javamail/javamail/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
    geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
    geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
    geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
    geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/pom.xml
    geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
    geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
    geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml

Modified: geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml Sun Jan 20 12:18:37 2008
@@ -80,7 +80,7 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml Sun Jan 20 12:18:37 2008
@@ -80,7 +80,7 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/ca-helper/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/ca-helper/pom.xml (original)
+++ geronimo/server/trunk/applications/ca-helper/pom.xml Sun Jan 20 12:18:37 2008
@@ -38,9 +38,9 @@
     </description>
 
     <modules>
-<module>ca-helper-jetty</module>
-<module>ca-helper-tomcat</module>
-<module>geronimo-ca-helper</module>
+        <module>ca-helper-jetty</module>
+        <module>ca-helper-tomcat</module>
+        <module>geronimo-ca-helper</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/applications/mejb/mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/mejb/mejb/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/mejb/mejb/pom.xml (original)
+++ geronimo/server/trunk/applications/mejb/mejb/pom.xml Sun Jan 20 12:18:37 2008
@@ -72,7 +72,7 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml Sun Jan 20 12:18:37 2008
@@ -69,7 +69,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <version>${geronimoVersion}</version>
                 <configuration>

Modified: geronimo/server/trunk/applications/monitoring/agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent/pom.xml Sun Jan 20 12:18:37 2008
@@ -69,7 +69,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml Sun Jan 20 12:18:37 2008
@@ -57,7 +57,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml Sun Jan 20 12:18:37 2008
@@ -98,7 +98,7 @@
         <plugins>
             <plugin>
 
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml Sun Jan 20 12:18:37 2008
@@ -105,7 +105,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/pom.xml Sun Jan 20 12:18:37 2008
@@ -91,7 +91,19 @@
         </dependencies>
     </dependencyManagement>
 
-
+    <modules>
+        <module>agent</module>
+        <module>agent-ds</module>
+        <module>agent-ear</module>
+        <module>agent-ejb</module>
+        <module>agent-sql</module>
+        <module>mconsole-ds</module>
+        <module>mconsole-ear</module>
+        <module>mconsole-jetty</module>
+        <module>mconsole-tomcat</module>
+        <module>mconsole-war</module>
+    </modules>
+    
     <build>
         <resources>
             <resource>
@@ -104,7 +116,7 @@
                 <!-- inheriting configration for war plugin, i,e, precompile JSPs -->
                 <!-- inherits car configuration from parent -->
                 <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>car-maven-plugin</artifactId>
                     <configuration>
                         <useMavenDependencies>
@@ -116,17 +128,5 @@
             </plugins>
         </pluginManagement>
     </build>
-    
-    <modules>
-        <module>agent</module>
-        <module>agent-ds</module>
-        <module>agent-ear</module>
-        <module>agent-ejb</module>
-        <module>agent-sql</module>
-        <module>mconsole-ds</module>
-        <module>mconsole-ear</module>
-        <module>mconsole-jetty</module>
-        <module>mconsole-tomcat</module>
-        <module>mconsole-war</module>
-    </modules>
+
 </project>

Modified: geronimo/server/trunk/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/pom.xml Sun Jan 20 12:18:37 2008
@@ -38,9 +38,9 @@
     </description>
 
     <modules>
-<module>geronimo-remote-deploy</module>
-<module>remote-deploy-jetty</module>
-<module>remote-deploy-tomcat</module>
+        <module>geronimo-remote-deploy</module>
+        <module>remote-deploy-jetty</module>
+        <module>remote-deploy-tomcat</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml Sun Jan 20 12:18:37 2008
@@ -78,7 +78,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>

Modified: geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml Sun Jan 20 12:18:37 2008
@@ -78,7 +78,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>

Modified: geronimo/server/trunk/applications/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/sharedlib/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/sharedlib/pom.xml (original)
+++ geronimo/server/trunk/applications/sharedlib/pom.xml Sun Jan 20 12:18:37 2008
@@ -53,7 +53,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <category>Example</category>

Modified: geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml Sun Jan 20 12:18:37 2008
@@ -107,7 +107,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml Sun Jan 20 12:18:37 2008
@@ -113,7 +113,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/pom.xml Sun Jan 20 12:18:37 2008
@@ -38,9 +38,9 @@
     </description>
 
     <modules>
-<module>geronimo-welcome</module>
-<module>welcome-jetty</module>
-<module>welcome-tomcat</module>
+        <module>geronimo-welcome</module>
+        <module>welcome-jetty</module>
+        <module>welcome-tomcat</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml Sun Jan 20 12:18:37 2008
@@ -89,7 +89,7 @@
         
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
@@ -104,7 +104,7 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                <useMavenDependencies>
+                    <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>

Modified: geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml Sun Jan 20 12:18:37 2008
@@ -88,7 +88,7 @@
         
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Sun Jan 20 12:18:37 2008
@@ -221,30 +221,30 @@
         FIXME: Bad idea for plugins
         -->
         <!--
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
         -->
 
         <!-- lib/endorsed Dependencies -->
@@ -406,7 +406,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <executions>
                     <execution>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Sun Jan 20 12:18:37 2008
@@ -205,7 +205,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <executions>
                     <execution>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Sun Jan 20 12:18:37 2008
@@ -645,7 +645,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <executions>
                     <execution>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Sun Jan 20 12:18:37 2008
@@ -328,7 +328,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <executions>
                     <execution>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Sun Jan 20 12:18:37 2008
@@ -645,7 +645,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <executions>
                     <execution>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Sun Jan 20 12:18:37 2008
@@ -328,7 +328,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <executions>
                     <execution>

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Sun Jan 20 12:18:37 2008
@@ -49,12 +49,9 @@
     </modules>
 
     <build>
-
         <plugins>
-
-
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <servers>
@@ -89,5 +86,6 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
 

Modified: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml Sun Jan 20 12:18:37 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.buildsupport</groupId>
         <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>buildsupport-maven-plugin</artifactId>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml Sun Jan 20 12:18:37 2008
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -23,26 +21,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
-
+    
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>maven-plugins</artifactId>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
     <artifactId>car-maven-plugin</artifactId>
-    <name>Geronimo Maven2 Plugins :: CAR</name>
+    <name>Geronimo Build Support, CAR</name>
     <packaging>maven-plugin</packaging>
 
-    <description>The car-maven-plugin handles all aspects of "predeploying" a module into a Geronimo car file and installing car files into a Geronimo server.
-    As part of this it processes plan files to include the module Id and dependencies, and generates geronimo-plugin.xml metadata files and
-    manages a geronimo-plugins.xml catalog in the local maven repository.</description>
+    <description>
+        The car-maven-plugin handles all aspects of "predeploying" a module into a Geronimo car file and installing car files into a Geronimo server.
+        As part of this it processes plan files to include the module Id and dependencies, and generates geronimo-plugin.xml metadata files and
+        manages a geronimo-plugins.xml catalog in the local maven repository.
+    </description>
     
-    <prerequisites>
-        <maven>2.0.5</maven>
-    </prerequisites>
-
     <dependencies>
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -149,6 +144,11 @@
     
     <build>
         <plugins>
+            <!--
+            FIXME: These test modules are a bit whacky WRT pom parents... 
+                   so turn them off for now, then fix after the o.a.g.buildsupport
+                   change is finished.
+            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>shitty-maven-plugin</artifactId>
@@ -172,6 +172,7 @@
                     </execution>
                 </executions>
             </plugin>
+            -->
         </plugins>
     </build>
     

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml Sun Jan 20 12:18:37 2008
@@ -120,7 +120,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <archive>
@@ -210,7 +210,6 @@
                         </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
-
                     <category>Geronimo Core</category>
                     <osiApproved>true</osiApproved>
                     <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
@@ -218,7 +217,6 @@
                         <value>true</value>
                         <includeVersion>false</includeVersion>
                     </useMavenDependencies>
-
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml Sun Jan 20 12:18:37 2008
@@ -120,7 +120,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <archive>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration-2/pom.xml Sun Jan 20 12:18:37 2008
@@ -66,7 +66,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <category>Test</category>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml Sun Jan 20 12:18:37 2008
@@ -105,7 +105,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <category>Test</category>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java Sun Jan 20 12:18:37 2008
@@ -33,7 +33,7 @@
 import org.codehaus.plexus.archiver.ArchiverException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  * @goal archive
  */
 public class ArchiveMojo extends MojoSupport {

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java Sun Jan 20 12:18:37 2008
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 package org.apache.geronimo.mavenplugins.car;
 
 import java.io.File;
@@ -49,7 +48,7 @@
  * Creates or replaces a geronimo-plugins.xml catalog of geronimo plugins in the local maven repository.  Although geronimo-plugins.xml is
  * maintained automatically when you build geronimo plugins locally, this is useful if you have downloaded plugins from elsewhere or
  * corrupted the geronimo-plugins.xml file.  This must be run explcitly using the command line
- * mvn org.apache.geronimo.plugins:car-maven-plugin:create-pluginlist
+ * mvn org.apache.geronimo.buildsupport:car-maven-plugin:create-pluginlist
  *
  * @version $Rev$ $Date$
  * @goal create-pluginlist

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java Sun Jan 20 12:18:37 2008
@@ -136,7 +136,11 @@
         }
 
         PluginArtifactType instance;
-        Plugin plugin = (Plugin) project.getModel().getBuild().getPluginsAsMap().get("org.apache.geronimo.plugins:car-maven-plugin");
+        Plugin plugin = (Plugin) project.getModel().getBuild().getPluginsAsMap().get("org.apache.geronimo.buildsupport:car-maven-plugin");
+        if (plugin == null) {
+            throw new Error("Unable to resolve car plugin");
+        }
+        
         Xpp3Dom dom;
         if (plugin.getExecutions().isEmpty()) {
             dom = (Xpp3Dom) plugin.getConfiguration();

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ValidateConfigurationMojo.java Sun Jan 20 12:18:37 2008
@@ -23,13 +23,11 @@
 import java.util.List;
 import java.util.Collections;
 
-
-
 /**
  * Check that all dependencies mentioned explicitly in the car-maven-plugin configuration are present as maven dependencies.
  *
  * @goal validate-configuration
-
+ *
  * @version $Rev$ $Date$
  */
 public class ValidateConfigurationMojo extends AbstractCarMojo {
@@ -41,7 +39,6 @@
      */
     private List<Dependency> dependencies = Collections.emptyList();
 
-
     public void doExecute() {
         for (Dependency dependency: dependencies) {
             checkForMatch(dependency);
@@ -56,7 +53,6 @@
             }
         }
         throw new IllegalStateException("No match for dependency: " + dependency);
-
     }
 
     private boolean matches(org.apache.maven.model.Dependency test, Dependency dependency) {
@@ -74,5 +70,4 @@
         }
         return true;
     }
-
 }

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml Sun Jan 20 12:18:37 2008
@@ -35,14 +35,24 @@
                     <lifecycle>
                         <id>default</id>
                         <phases>
-                            <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-                            <compile>org.apache.geronimo.plugins:car-maven-plugin:validate-configuration,
-                            org.apache.geronimo.plugins:car-maven-plugin:prepare-plan,
-                            org.apache.geronimo.plugins:car-maven-plugin:prepare-metadata</compile>
-                            <package>org.apache.geronimo.plugins:car-maven-plugin:package</package>
-                            <install>org.apache.maven.plugins:maven-install-plugin:install,
-                            org.apache.geronimo.plugins:car-maven-plugin:update-pluginlist</install>
-                            <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+                            <process-resources>
+                                org.apache.maven.plugins:maven-resources-plugin:resources
+                            </process-resources>
+                            <compile>
+                                org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata
+                            </compile>
+                            <package>
+                                org.apache.geronimo.buildsupport:car-maven-plugin:package
+                            </package>
+                            <install>
+                                org.apache.maven.plugins:maven-install-plugin:install,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:update-pluginlist
+                            </install>
+                            <deploy>
+                                org.apache.maven.plugins:maven-deploy-plugin:deploy
+                            </deploy>
                         </phases>
                     </lifecycle>
                 </lifecycles>
@@ -68,8 +78,8 @@
                         <id>default</id>
                         <phases>
                             <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-                            <compile>org.apache.geronimo.plugins:car-maven-plugin:prepare-plan</compile>
-                            <package>org.apache.geronimo.plugins:car-maven-plugin:package</package>
+                            <compile>org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan</compile>
+                            <package>org.apache.geronimo.buildsupport:car-maven-plugin:package</package>
                             <install>org.apache.maven.plugins:maven-install-plugin:install</install>
                             <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
                         </phases>

Modified: geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml Sun Jan 20 12:18:37 2008
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -23,16 +21,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
-
+    
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>maven-plugins</artifactId>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>geronimo-maven-plugin</artifactId>
-    <name>Geronimo Maven2 Plugins :: Geronimo</name>
+    <name>Geronimo Build Support, Geronimo</name>
     <packaging>maven-plugin</packaging>
     
     <description>

Modified: geronimo/server/trunk/buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/pom.xml Sun Jan 20 12:18:37 2008
@@ -48,8 +48,37 @@
         </dependencies>
     </dependencyManagement>
     
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>plugin-support</artifactId>
+            <version>1.0-alpha-1</version>
+        </dependency>
+    </dependencies>
+    
     <modules>
         <module>buildsupport-maven-plugin</module>
+        <module>car-maven-plugin</module>
+        <module>geronimo-maven-plugin</module>
+        <module>testsuite-maven-plugin</module>
+        <module>testsuite-archetype-plugin</module>
     </modules>
+    
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <version>2.3</version>
+            </plugin>
+        </plugins>
+    </reporting>
 
 </project>

Modified: geronimo/server/trunk/buildsupport/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/src/site/site.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/src/site/site.xml (original)
+++ geronimo/server/trunk/buildsupport/src/site/site.xml Sun Jan 20 12:18:37 2008
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
-<!-- $Rev$ Date$ -->
+<!-- $Rev$ $Date$ -->
 
 <project name="${project.name}">
     

Modified: geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml Sun Jan 20 12:18:37 2008
@@ -1,42 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
-
     <modelVersion>4.0.0</modelVersion>
-
+    
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>maven-plugins</artifactId>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
     <artifactId>geronimo-archetype-testsuite</artifactId>
-    <name>Geronimo Maven2 Plugins :: Testsuite Archetype</name>
+    <name>Geronimo Build Support, Testsuite Archetype</name>
     <packaging>maven-plugin</packaging>
     
-    <description> Plugin to help create a testsuite</description>
+    <description>Plugin to help create a testsuite</description>
 
 </project>
 

Modified: geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/src/main/resources/archetype-resources/pom.xml Sun Jan 20 12:18:37 2008
@@ -95,7 +95,7 @@
 
                     <!-- The following plugin starts and stop Geronimo server in the pre-integration-test and post-integration-test phase respectively -->
                     <plugin>
-                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                     </plugin>
 

Modified: geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml?rev=613667&r1=613642&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml Sun Jan 20 12:18:37 2008
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -23,15 +21,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>maven-plugins</artifactId>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>testsuite-maven-plugin</artifactId>
-    <name>Geronimo Maven2 Plugins :: Testsuite Plugin</name>
+    <name>Geronimo Build Support, Testsuite Plugin</name>
     <packaging>maven-plugin</packaging>
     
     <description>Plugin to help Geronimo testsuite</description>

Modified: geronimo/server/trunk/components/spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/spring/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/components/spring/pom.xml (original)
+++ geronimo/server/trunk/components/spring/pom.xml Sun Jan 20 12:18:37 2008
@@ -78,7 +78,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <useMavenDependencies>

Modified: geronimo/server/trunk/components/transformer-agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/transformer-agent/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/components/transformer-agent/pom.xml (original)
+++ geronimo/server/trunk/components/transformer-agent/pom.xml Sun Jan 20 12:18:37 2008
@@ -49,7 +49,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <archive>

Modified: geronimo/server/trunk/components/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/components/upgrade/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/components/upgrade/pom.xml (original)
+++ geronimo/server/trunk/components/upgrade/pom.xml Sun Jan 20 12:18:37 2008
@@ -53,7 +53,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <category>Deployment</category>

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>client-system</artifactId>
-    <name>Geronimo Configs :: Client System</name>
+    <name>Geronimo Framework, Configs :: Client System</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -105,7 +105,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <archive>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
-    <name>Geronimo Configs :: GBean Deployer Boostrap version</name>
+    <name>Geronimo Framework, Configs :: GBean Deployer Boostrap version</name>
     <packaging>car</packaging>
     
     <dependencies>
@@ -83,7 +83,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>geronimo-gbean-deployer</artifactId>
-    <name>Geronimo Configs :: GBean Deployer</name>
+    <name>Geronimo Framework, Configs :: GBean Deployer</name>
     <packaging>car</packaging>
 
     <description>
@@ -83,7 +83,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Sun Jan 20 12:18:37 2008
@@ -30,7 +30,7 @@
     
     <!-- change this to server-security -->
     <artifactId>j2ee-security</artifactId>
-    <name>Geronimo Configs :: J2EE Security</name>
+    <name>Geronimo Framework, Configs :: J2EE Security</name>
     <packaging>car</packaging>
 
     <description>Basic Geronimo server security infrastructure</description>
@@ -69,7 +69,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <useMavenDependencies>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>j2ee-system</artifactId>
-    <name>Geronimo Configs :: J2EE System</name>
+    <name>Geronimo Framework, Configs :: J2EE System</name>
     <packaging>car</packaging>
 
     <description>Base geronimo server that sets up the kernel.</description>
@@ -137,7 +137,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 
                 <configuration>

Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>jee-specs</artifactId>
-    <name>Geronimo Configs :: JavaEE Specs</name>
+    <name>Geronimo Framework, Configs :: JavaEE Specs</name>
     <packaging>car</packaging>
 
     <description>The JavaEE spec jars in a single classloader.</description>
@@ -192,7 +192,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>jsr88-cli</artifactId>
-    <name>Geronimo Configs :: JSR88 CLI</name>
+    <name>Geronimo Framework, Configs :: JSR88 CLI</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -126,7 +126,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <useMavenDependencies>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>jsr88-deploymentfactory</artifactId>
-    <name>Geronimo Configs :: JSR88 DeploymentFactory</name>
+    <name>Geronimo Framework, Configs :: JSR88 DeploymentFactory</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -102,7 +102,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <archive>

Modified: geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/offline-deployer/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/offline-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/offline-deployer/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>offline-deployer</artifactId>
-    <name>Geronimo Configs :: Offline Deployer</name>
+    <name>Geronimo Framework, Configs :: Offline Deployer</name>
     <packaging>car</packaging>
 
     <description>Offline deployer</description>
@@ -55,7 +55,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <useMavenDependencies>

Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>online-deployer</artifactId>
-    <name>Geronimo Configs :: Online Deployer</name>
+    <name>Geronimo Framework, Configs :: Online Deployer</name>
     <packaging>car</packaging>
 
     <description>Geronimo Online Deployer</description>
@@ -135,7 +135,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <archive>

Modified: geronimo/server/trunk/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/pom.xml Sun Jan 20 12:18:37 2008
@@ -29,13 +29,12 @@
     </parent>
 
     <artifactId>plugin</artifactId>
-    <name>Geronimo Configs :: Plugin Management</name>
+    <name>Geronimo Framework, Configs :: Plugin Management</name>
     <packaging>car</packaging>
 
     <description>Plugin management services including the installer.</description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
@@ -79,10 +78,11 @@
             <type>car</type>
         </dependency>
     </dependencies>
+    
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>

Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=613667&r1=613666&r2=613667&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Sun Jan 20 12:18:37 2008
@@ -30,7 +30,7 @@
     
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>configs</artifactId>
-    <name>Geronimo Configs</name>
+    <name>Geronimo Framework, Configs</name>
     <packaging>pom</packaging>
     
     <properties>
@@ -97,7 +97,7 @@
 
         <extensions>
             <extension>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <version>${version}</version>
             </extension>
@@ -106,7 +106,7 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <!-- Install as extention to allow 'car' packaging to be used. -->
                 <extensions>true</extensions>