geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r420686 - in /geronimo/sandbox/svkmerge/m2migration: configs/ configs/activemq/ configs/client-corba/ configs/client-security/ configs/console-jetty/ configs/console-tomcat/ configs/directory/ configs/j2ee-corba/ configs/j2ee-security/ conf...
Date Tue, 11 Jul 2006 03:09:13 GMT
Author: jdillon
Date: Mon Jul 10 20:09:12 2006
New Revision: 420686

URL: http://svn.apache.org/viewvc?rev=420686&view=rev
Log:
Using m2 to set array list based on configuration for deploymentConfig instead of post processing
That means that: <deploymentConfig>xxx,yyy,zzz</deploymentConfig> is now:
<deploymentConfigs>
   <deploymentConfig>xxx</deploymentConfig>
   <deploymentConfig>yyy</deploymentConfig>
   <deploymentConfig>zzz</deploymentConfig>
</deploymentConfigs>

Adding getProjectArtifacts() to help gen explicit_versions.properties
Invoking PackageBuilder directly... dropped RMI non-sense
Cleaned up some logging and reuse from AbstractPackagingMojo


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/console-jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/directory/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/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/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/system-database/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/tomcat/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-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java

Modified: geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml Mon Jul 10 20:09:12 2006
@@ -65,7 +65,13 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeNowebServer}</deploymentConfig>  <!-- no web deployer -->
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                    <moduleFile>${settings.localRepository}/org/apache/geronimo/modules/ge-activemq-rar/${pom.version}/ge-activemq-rar-${pom.version}.rar</moduleFile> 
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml Mon Jul 10 20:09:12 2006
@@ -65,7 +65,12 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>            
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                  </configuration>
             </plugin>
         </plugins>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml Mon Jul 10 20:09:12 2006
@@ -78,7 +78,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml Mon Jul 10 20:09:12 2006
@@ -200,7 +200,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml Mon Jul 10 20:09:12 2006
@@ -200,7 +200,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/directory/pom.xml?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/directory/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/directory/pom.xml Mon Jul 10 20:09:12 2006
@@ -47,4 +47,5 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml Mon Jul 10 20:09:12 2006
@@ -62,8 +62,13 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>
-                </configuration>                  
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                </configuration>
             </plugin>
         </plugins>
     </build>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml Mon Jul 10 20:09:12 2006
@@ -89,7 +89,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml Mon Jul 10 20:09:12 2006
@@ -63,7 +63,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml Mon Jul 10 20:09:12 2006
@@ -58,7 +58,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml Mon Jul 10 20:09:12 2006
@@ -58,7 +58,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${pom.version}/geronimo-ldap-demo-${pom.version}.war</moduleFile>
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml Mon Jul 10 20:09:12 2006
@@ -58,7 +58,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${pom.version}/geronimo-ldap-demo-${pom.version}.war</moduleFile>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/pom.xml?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/pom.xml Mon Jul 10 20:09:12 2006
@@ -38,16 +38,13 @@
         <geronimoVersion>${pom.version}</geronimoVersion>
         <pom.currentVersion>${pom.version}</pom.currentVersion>
         
-        <!-- add from etc/explicit_version.properties here to use filter-->
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car</j2eeDeployer>
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
         <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
         <axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
-        <j2eeTomcatServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car,org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car,org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car,org.apache.geronimo.configs/client-deployer/${pom.version}/car,org.apache.geronimo.configs/openejb-deployer/${pom.version}/car,org.apache.geronimo.configs/axis-deployer/${pom.version}/car</j2eeTomcatServer>
-        <j2eeJettyServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car,org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car,org.apache.geronimo.configs/jetty-deployer/${pom.version}/car,org.apache.geronimo.configs/client-deployer/${pom.version}/car,org.apache.geronimo.configs/openejb-deployer/${pom.version}/car,org.apache.geronimo.configs/axis-deployer/${pom.version}/car</j2eeJettyServer>
-        <j2eeNowebServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car,org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car,org.apache.geronimo.configs/client-deployer/${pom.version}/car,org.apache.geronimo.configs/openejb-deployer/${pom.version}/car,org.apache.geronimo.configs/axis-deployer/${pom.version}/car</j2eeNowebServer>
+        <jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${pom.version}/car</jettyDeployer>
         
         <!-- Common plan properties -->
         <PlanServerHostname>localhost</PlanServerHostname>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml Mon Jul 10 20:09:12 2006
@@ -72,7 +72,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml Mon Jul 10 20:09:12 2006
@@ -72,7 +72,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml Mon Jul 10 20:09:12 2006
@@ -104,7 +104,13 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeNowebServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/tranql/tranql-connector-derby-embed-xa/${tranqlVendorsVersion}/tranql-connector-derby-embed-xa-${tranqlVendorsVersion}.rar</moduleFile>
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml Mon Jul 10 20:09:12 2006
@@ -65,7 +65,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml Mon Jul 10 20:09:12 2006
@@ -56,4 +56,5 @@
         </dependency> -->
         
     </dependencies>
+
 </project>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml Mon Jul 10 20:09:12 2006
@@ -50,7 +50,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml Mon Jul 10 20:09:12 2006
@@ -50,7 +50,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml Mon Jul 10 20:09:12 2006
@@ -50,7 +50,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml Mon Jul 10 20:09:12 2006
@@ -58,7 +58,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${pom.version}/geronimo-welcome-${pom.version}.war</moduleFile>
                 </configuration>
             </plugin>

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=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml Mon Jul 10 20:09:12 2006
@@ -58,7 +58,14 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${pom.version}/geronimo-welcome-${pom.version}.war</moduleFile>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java Mon Jul 10 20:09:12 2006
@@ -18,15 +18,115 @@
 
 import org.apache.geronimo.plugin.MojoSupport;
 
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Exclusion;
+
+import java.io.File;
+import java.util.Set;
+import java.util.List;
+import java.util.Iterator;
+import java.util.HashSet;
+import java.util.ArrayList;
+
 /**
- * Support for <em>packaging</em> Mojo implementations.
+ * Support for <em>packaging</em> Mojos.
  *
  * @version $Id$
  */
 public abstract class AbstractPackagingMojo
     extends MojoSupport
 {
-    //
-    // NOTE: Nothing specific to the packaging plugin (yet)
-    //
+    /**
+     * The maven project.
+     *
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    protected MavenProject project;
+
+    /**
+     * The basedir of the project.
+     *
+     * @parameter expression="${basedir}"
+     * @required
+     * @readonly
+     */
+    protected File basedir;
+
+    /**
+     * The maven project's helper.
+     *
+     * @parameter expression="${component.org.apache.maven.project.MavenProjectHelper}"
+     * @required
+     * @readonly
+     */
+    protected MavenProjectHelper projectHelper;
+
+    /**
+     * @parameter expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
+     * @required
+     * @readonly
+     */
+    protected ArtifactFactory artifactFactory;
+
+    protected Set getProjectArtifacts(final MavenProject project) {
+        Set artifacts = new HashSet();
+
+        Iterator dependencies = project.getDependencies().iterator();
+        while (dependencies.hasNext()) {
+            Dependency dep = (Dependency) dependencies.next();
+
+            String groupId = dep.getGroupId();
+            String artifactId = dep.getArtifactId();
+            VersionRange versionRange = VersionRange.createFromVersion(dep.getVersion());
+            String type = dep.getType();
+            if (type == null) {
+                type = "jar";
+            }
+
+            String classifier = dep.getClassifier();
+            boolean optional = dep.isOptional();
+            String scope = dep.getScope();
+            if (scope == null) {
+                scope = Artifact.SCOPE_COMPILE;
+            }
+
+            Artifact artifact = artifactFactory.createDependencyArtifact(
+                groupId,
+                artifactId,
+                versionRange,
+                type,
+                classifier,
+                scope,
+                optional);
+
+            if (scope.equalsIgnoreCase(Artifact.SCOPE_SYSTEM)) {
+                artifact.setFile(new File(dep.getSystemPath()));
+            }
+
+            List exclusions = new ArrayList();
+            for (Iterator j = dep.getExclusions().iterator(); j.hasNext();) {
+                Exclusion e = (Exclusion) j.next();
+                exclusions.add(e.getGroupId() + ":" + e.getArtifactId());
+            }
+
+            ArtifactFilter newFilter = new ExcludesArtifactFilter(exclusions);
+            artifact.setDependencyFilter(newFilter);
+            artifacts.add(artifact);
+        }
+
+        return artifacts;
+    }
+
+    protected Set getProjectArtifacts() {
+        return getProjectArtifacts(project);
+    }
 }

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java Mon Jul 10 20:09:12 2006
@@ -19,16 +19,12 @@
 
 import java.io.File;
 import java.util.Iterator;
-import java.util.List;
 
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
 
 //
 // TODO: Rename to InstallMojo

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java Mon Jul 10 20:09:12 2006
@@ -47,8 +47,7 @@
 import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
 
 /**
- * JellyBean that builds a Geronimo Configuration using the local Mavem
- * infrastructure.
+ * Builds a Geronimo Configuration using the local Maven infrastructure.
  *
  * @version $Rev:385659 $ $Date$
  */
@@ -58,14 +57,6 @@
 
     private static final String KERNEL_NAME = "geronimo.maven";
 
-    /**
-     * Reference to the kernel that will last the lifetime of this classloader.
-     * The KernelRegistry keeps soft references that may be garbage collected.
-     */
-    private static Kernel kernel;
-    private static AbstractName targetConfigStoreAName;
-    private static AbstractName targetRepositoryAName;
-
     private static final String[] ARG_TYPES = {
         boolean.class.getName(),
         File.class.getName(),
@@ -82,37 +73,65 @@
         String.class.getName(),
     };
 
+    /**
+     * Reference to the kernel that will last the lifetime of this classloader.
+     * The KernelRegistry keeps soft references that may be garbage collected.
+     */
+    private static Kernel kernel;
+
+    private static AbstractName targetConfigStoreAName;
+
+    private static AbstractName targetRepositoryAName;
+
     private String repositoryClass;
+
     private String configurationStoreClass;
+
     private String targetRepositoryClass;
+
     private String targetConfigurationStoreClass;
 
     private File repository;
+
     private File targetRepository;
+
     private Collection deploymentConfigs;
+
     private AbstractName deployerName;
 
     private File planFile;
+
     private File moduleFile;
+
     private File packageFile;
+
     private String mainClass;
+
     private String mainGBean;
+
     private String mainMethod;
+
     private String configurations;
+
     private String classPath;
+
     private String endorsedDirs;
+
     private String extensionDirs;
+
     private String explicitResolutionLocation;
+
     private String logLevel;
 
     private boolean targetSet;
+
     private boolean singleArtifact = true;
 
     public String getRepositoryClass() {
         return repositoryClass;
     }
 
-    public void setRepositoryClass(String repositoryClass) {
+    public void setRepositoryClass(final String repositoryClass) {
         this.repositoryClass = repositoryClass;
     }
 
@@ -120,7 +139,7 @@
         return configurationStoreClass;
     }
 
-    public void setConfigurationStoreClass(String configurationStoreClass) {
+    public void setConfigurationStoreClass(final String configurationStoreClass) {
         this.configurationStoreClass = configurationStoreClass;
     }
 
@@ -128,12 +147,7 @@
         return repository;
     }
 
-    /**
-     * Set the location of the Maven repository; typically ${maven.repo.local}
-     *
-     * @param repository the location of the Maven repository
-     */
-    public void setRepository(File repository) {
+    public void setRepository(final File repository) {
         this.repository = repository;
     }
 
@@ -141,7 +155,7 @@
         return targetRepositoryClass;
     }
 
-    public void setTargetRepositoryClass(String targetRepositoryClass) {
+    public void setTargetRepositoryClass(final String targetRepositoryClass) {
         this.targetRepositoryClass = targetRepositoryClass;
     }
 
@@ -149,7 +163,7 @@
         return targetConfigurationStoreClass;
     }
 
-    public void setTargetConfigurationStoreClass(String targetConfigurationStoreClass) {
+    public void setTargetConfigurationStoreClass(final String targetConfigurationStoreClass) {
         this.targetConfigurationStoreClass = targetConfigurationStoreClass;
     }
 
@@ -157,7 +171,7 @@
         return targetRepository;
     }
 
-    public void setTargetRepository(File targetRepository) {
+    public void setTargetRepository(final File targetRepository) {
         this.targetRepository = targetRepository;
     }
 
@@ -170,7 +184,7 @@
      *
      * @param deploymentConfigString comma-separated list of the ids of the Configurations performing the deployment
      */
-    public void setDeploymentConfig(Collection deploymentConfigString) {
+    public void setDeploymentConfig(final Collection deploymentConfigString) {
         this.deploymentConfigs = deploymentConfigString;
     }
 
@@ -183,7 +197,7 @@
      *
      * @param deployerName the name of the Deployer GBean
      */
-    public void setDeployerName(String deployerName) {
+    public void setDeployerName(final String deployerName) {
         this.deployerName = new AbstractName(URI.create(deployerName));
     }
 
@@ -196,7 +210,7 @@
      *
      * @param planFile the deployment plan
      */
-    public void setPlanFile(File planFile) {
+    public void setPlanFile(final File planFile) {
         this.planFile = planFile;
     }
 
@@ -209,7 +223,7 @@
      *
      * @param moduleFile the module to deploy
      */
-    public void setModuleFile(File moduleFile) {
+    public void setModuleFile(final File moduleFile) {
         this.moduleFile = moduleFile;
     }
 
@@ -222,7 +236,7 @@
      *
      * @param packageFile the package file to produce
      */
-    public void setPackageFile(File packageFile) {
+    public void setPackageFile(final File packageFile) {
         this.packageFile = packageFile;
     }
 
@@ -351,7 +365,7 @@
             targetSet = true;
         }
         catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.toString(), e);
             throw e;
         }
     }
@@ -376,6 +390,7 @@
             geronimoLogging = GeronimoLogging.DEBUG;
         }
         GeronimoLogging.initialize(geronimoLogging);
+
         // boot one ourselves
         kernel = KernelFactory.newInstance().createKernel(KERNEL_NAME);
         kernel.boot();
@@ -398,13 +413,13 @@
         ClassLoader cl = PackageBuilder.class.getClassLoader();
         Set repoNames = new HashSet();
 
-        //Source repo
+        // Source repo
         GBeanData repoGBean = bootstrap.addGBean("SourceRepository", GBeanInfo.getGBeanInfo(repositoryClass, cl));
         URI repositoryURI = repository.toURI();
         repoGBean.setAttribute("root", repositoryURI);
         repoNames.add(repoGBean.getAbstractName());
 
-        //Target repo
+        // Target repo
         GBeanData targetRepoGBean = bootstrap.addGBean("TargetRepository", GBeanInfo.getGBeanInfo(targetRepositoryClass, cl));
         URI targetRepositoryURI = targetRepository.toURI();
         targetRepoGBean.setAttribute("root", targetRepositoryURI);
@@ -420,7 +435,8 @@
         artifactResolverGBean.setReferencePattern("ArtifactManager", artifactManagerGBean.getAbstractName());
 
         Set storeNames = new HashSet();
-        //source config store
+
+        // Source config store
         GBeanInfo configStoreInfo = GBeanInfo.getGBeanInfo(configurationStoreClass, cl);
         GBeanData storeGBean = bootstrap.addGBean("ConfigStore", configStoreInfo);
         if (configStoreInfo.getReference("Repository") != null) {
@@ -428,7 +444,7 @@
         }
         storeNames.add(storeGBean.getAbstractName());
 
-        //target config store
+        // Target config store
         GBeanInfo targetConfigStoreInfo = GBeanInfo.getGBeanInfo(targetConfigurationStoreClass, cl);
         GBeanData targetStoreGBean = bootstrap.addGBean("TargetConfigStore", targetConfigStoreInfo);
         if (targetConfigStoreInfo.getReference("Repository") != null) {
@@ -456,6 +472,7 @@
      *
      * @param kernel the kernel to search.
      * @return the ObjectName of the Deployer GBean
+     *
      * @throws IllegalStateException if there is not exactly one GBean matching the deployerName pattern
      */
     private AbstractName locateDeployer(Kernel kernel) {

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java Mon Jul 10 20:09:12 2006
@@ -18,18 +18,15 @@
 package org.apache.geronimo.plugin.packaging;
 
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
+import java.util.Set;
+import java.util.Iterator;
 
 import org.apache.geronimo.deployment.PluginBootstrap2;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.repository.Maven2Repository;
-
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
+import org.apache.maven.artifact.Artifact;
 
 import org.codehaus.plexus.util.FileUtils;
 
@@ -40,6 +37,9 @@
 /**
  * Build a Geronimo Configuration using the local Maven infrastructure.
  *
+ * <p>
+ * <b>NOTE:</b> Calling pom.xml must have defined a ${geronimoVersion} property.
+ *
  * @goal package
  * @phase package
  *
@@ -50,13 +50,6 @@
 {
     private List artifacts;
 
-    private static ClassLoader classLoader;
-
-    /**
-     * @parameter expression="${project}"
-     */
-    private MavenProject project;
-
     /**
      * @parameter expression="${settings.localRepository}"
      */
@@ -69,10 +62,14 @@
 
     /**
      * @parameter expression="org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car"
+     * @readonly
      */
-    private String deploymentConfig;
+    private String deafultDeploymentConfig;
 
-    private Collection deploymentConfigList;
+    /**
+     * @parameter
+     */
+    private ArrayList deploymentConfigs;
 
     /**
      * @parameter expression="org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer"
@@ -159,7 +156,28 @@
         // We need to make sure to clean up any previous work first or this operation will fail
         FileUtils.forceDelete(targetRepository);
         FileUtils.forceMkdir(targetRepository);
-        
+
+        // Use the default configs if none specified
+        if (deploymentConfigs == null) {
+            deploymentConfigs = new ArrayList();
+            deploymentConfigs.add(deafultDeploymentConfig);
+        }
+        log.debug("Deployment configs: " + deploymentConfigs);
+
+        //
+        // HACK: Generate explicit_versions for all our dependencies...
+        //
+
+        Set artifacts = getProjectArtifacts();
+        Iterator iter = artifacts.iterator();
+        while (iter.hasNext()) {
+            Artifact artifact = (Artifact)iter.next();
+            log.info(artifact.toString());
+        }
+
+        // ------
+
+
         if (boot) {
             executeBootShell();
         }
@@ -172,13 +190,6 @@
     }
 
     public void executeBootShell() throws Exception {
-        if (log.isDebugEnabled()) {
-            log.debug("Build dir: " + buildDir);
-            log.debug("Package file: " + packageFile);
-            log.debug("Repository: " + repository);
-            log.debug("Plan file: " + planFile);
-        }
-
         PluginBootstrap2 boot = new PluginBootstrap2();
 
         boot.setBuildDir(buildDir);
@@ -189,87 +200,30 @@
         boot.bootstrap();
     }
 
-    public void setDeploymentConfigList(String deploymentConfigs) {
-        Collection values = new ArrayList();
-        String[] configList = deploymentConfigs.split(",");
-
-        for (int i = 0; i < configList.length; i++) {
-            values.add(configList[i]);
-        }
-
-        deploymentConfigList = values;
-    }
-
     public void executePackageBuilderShell() throws Exception {
-        setDeploymentConfigList(deploymentConfig);
-        Object packageBuilder = getPackageBuilder();
+        PackageBuilder builder = new PackageBuilder();
 
-        set("setClassPath", classPath, String.class, packageBuilder);
-        set("setDeployerName", deployerName, String.class, packageBuilder);
-        set("setDeploymentConfig", deploymentConfigList, Collection.class, packageBuilder);
-        set("setEndorsedDirs", endorsedDirs, String.class, packageBuilder);
-        set("setExtensionDirs", extensionDirs, String.class, packageBuilder);
-        set("setMainClass", mainClass, String.class, packageBuilder);
-        set("setMainMethod", mainMethod, String.class, packageBuilder);
-        set("setMainGBean", mainGBean, String.class, packageBuilder);
-        set("setConfigurations", configurations, String.class, packageBuilder);
-        set("setModuleFile", moduleFile, File.class, packageBuilder);
-        set("setPackageFile", packageFile, File.class, packageBuilder);
-        set("setPlanFile", planFile, File.class, packageBuilder);
-        set("setRepository", repository, File.class, packageBuilder);
-        set("setRepositoryClass", Maven2Repository.class.getName(), String.class, packageBuilder);
-        set("setConfigurationStoreClass", MavenConfigStore.class.getName(), String.class, packageBuilder);
-        set("setTargetRepository", targetRepository, File.class, packageBuilder);
-        set("setTargetRepositoryClass", Maven2Repository.class.getName(), String.class, packageBuilder);
-        set("setTargetConfigurationStoreClass", RepositoryConfigurationStore.class.getName(), String.class, packageBuilder);
-        set("setExplicitResolutionLocation", explicitResolutionLocation, String.class, packageBuilder);
-        set("setLogLevel", logLevel, String.class, packageBuilder);
-        
-        try {
-            Method m = packageBuilder.getClass().getMethod("execute", new Class[0]);
-            m.invoke(packageBuilder, new Object[0]);
-        }
-        catch (InvocationTargetException e) {
-            log.debug("Decoding ITE", e);
-            
-            Throwable t = e.getTargetException();
-            
-            if (t instanceof Exception) {
-                throw (Exception)t;
-            }
-            if (t instanceof Error) {
-                throw (Error)t;
-            }
-            
-            throw new Error(t);
-        }
-    }
-
-    private void set(String methodName, Object value, Class type, Object packageBuilder) throws Exception {
-        log.debug("Setting (" + methodName + "): " + value);
-
-        try {
-            Method m = packageBuilder.getClass().getMethod(methodName, new Class[]{type});
-            m.invoke(packageBuilder, new Object[]{value});
-        }
-        catch (InvocationTargetException e) {
-            log.debug("Decoding ITE", e);
-            
-            // Decode ITE
-            Throwable t = e.getTargetException();
-            
-            if (t instanceof Exception) {
-                throw (Exception)t;
-            }
-            if (t instanceof Error) {
-                throw (Error)t;
-            }
-            
-            throw new Error(t);
-        }
-    }
+        builder.setClassPath(classPath);
+        builder.setDeployerName(deployerName);
+        builder.setDeploymentConfig(deploymentConfigs);
+        builder.setEndorsedDirs(endorsedDirs);
+        builder.setExtensionDirs(extensionDirs);
+        builder.setMainClass(mainClass);
+        builder.setMainMethod(mainMethod);
+        builder.setMainGBean(mainGBean);
+        builder.setConfigurations(configurations);
+        builder.setModuleFile(moduleFile);
+        builder.setPackageFile(packageFile);
+        builder.setPlanFile(planFile);
+        builder.setRepository(repository);
+        builder.setRepositoryClass(Maven2Repository.class.getName());
+        builder.setConfigurationStoreClass(MavenConfigStore.class.getName());
+        builder.setTargetRepository(targetRepository);
+        builder.setTargetRepositoryClass(Maven2Repository.class.getName());
+        builder.setTargetConfigurationStoreClass(RepositoryConfigurationStore.class.getName());
+        builder.setExplicitResolutionLocation(explicitResolutionLocation);
+        builder.setLogLevel(logLevel);
 
-    private Object getPackageBuilder() {
-        return new PackageBuilder();
+        builder.execute();
     }
 }

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java Mon Jul 10 20:09:12 2006
@@ -69,12 +69,12 @@
 
     public void execute() throws Exception {
         PackageBuilder builder = new PackageBuilder();
+
         builder.setClassPath(config.getProperty("classPath"));
         builder.setConfigurationStoreClass(config.getProperty("configurationStoreClass"));
         builder.setDeployerName(config.getProperty("deployerName"));
         String[] artifactNames = config.getProperty("deploymentConfig").split("/");
-        Collection configs = Arrays.asList(artifactNames);
-        builder.setDeploymentConfig(configs);
+        builder.setDeploymentConfig(Arrays.asList(artifactNames));
         builder.setEndorsedDirs(config.getProperty("endorsedDirs"));
         builder.setExtensionDirs(config.getProperty("extensionDirs"));
         builder.setMainClass(config.getProperty("mainClass"));
@@ -83,6 +83,7 @@
         builder.setPlanFile(getFile(config.getProperty("planFile")));
         builder.setRepository(getFile(config.getProperty("repository")));
         builder.setRepositoryClass(config.getProperty("repositoryClass"));
+
         builder.execute();
     }
 

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java?rev=420686&r1=420685&r2=420686&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java Mon Jul 10 20:09:12 2006
@@ -35,7 +35,6 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ImportType;
 
-import org.apache.maven.project.MavenProject;
 import org.apache.maven.model.Dependency;
 
 import org.apache.velocity.Template;
@@ -63,13 +62,6 @@
     private static final String ENVIRONMENT_LOCAL_NAME = "environment";
 
     private static final QName ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.1", "environment");
-
-    /**
-     * @parameter expression="${project}"
-     * @readonly
-     * @required
-     */
-    private MavenProject project;
 
     /**
      * @parameter expression="${basedir}/src/plan"



Mime
View raw message