geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r431008 [1/2] - in /geronimo/trunk: configs/activemq-broker/src/plan/ configs/axis/src/plan/ configs/client-corba/src/plan/ configs/client-deployer/src/plan/ configs/client-system/ configs/client-system/src/main/ configs/client-system/src/m...
Date Sat, 12 Aug 2006 10:22:23 GMT
Author: jdillon
Date: Sat Aug 12 03:22:18 2006
New Revision: 431008

URL: http://svn.apache.org/viewvc?rev=431008&view=rev
Log:
The car package builder no longer makes car files directly, but instead lets maven handle that
Updated pom's to use the maven archiver to specify extra manifest bits
Updated car package mojo to take a list of artifacts (classpathElements) which will be used to make the Class-Path manifest entry, this was needed to allow a subset of artifacts to use a custom prefix (for the lib/endorsed bits)
Finally we are including geronimo-plugin.xml again
Removed uneeded config fields/setters for manifest related bits in package builder now that it is handled externally via maven
Changed all ${pom.currentVersion} to ${pom.version} in plan.xml files
Car files now all have LICENSE.txt and NOTICE.txt included
Added startup-jar w/comments in that file for what its purpose is, so that the bootstrap can root itself now

Added:
    geronimo/trunk/configs/client-system/src/main/
    geronimo/trunk/configs/client-system/src/main/resources/
    geronimo/trunk/configs/client-system/src/main/resources/META-INF/
    geronimo/trunk/configs/client-system/src/main/resources/META-INF/startup-jar
    geronimo/trunk/configs/j2ee-system/src/main/
    geronimo/trunk/configs/j2ee-system/src/main/resources/
    geronimo/trunk/configs/j2ee-system/src/main/resources/META-INF/
    geronimo/trunk/configs/j2ee-system/src/main/resources/META-INF/startup-jar
    geronimo/trunk/configs/online-deployer/src/main/
    geronimo/trunk/configs/online-deployer/src/main/resources/
    geronimo/trunk/configs/online-deployer/src/main/resources/META-INF/
    geronimo/trunk/configs/online-deployer/src/main/resources/META-INF/startup-jar
    geronimo/trunk/configs/shutdown/src/main/
    geronimo/trunk/configs/shutdown/src/main/resources/
    geronimo/trunk/configs/shutdown/src/main/resources/META-INF/
    geronimo/trunk/configs/shutdown/src/main/resources/META-INF/startup-jar
    geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java   (with props)
Modified:
    geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
    geronimo/trunk/configs/axis/src/plan/plan.xml
    geronimo/trunk/configs/client-corba/src/plan/plan.xml
    geronimo/trunk/configs/client-deployer/src/plan/plan.xml
    geronimo/trunk/configs/client-system/pom.xml
    geronimo/trunk/configs/client/src/plan/plan.xml
    geronimo/trunk/configs/console-jetty/pom.xml
    geronimo/trunk/configs/console-tomcat/pom.xml
    geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/trunk/configs/hot-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-system/pom.xml
    geronimo/trunk/configs/javamail/src/plan/plan.xml
    geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
    geronimo/trunk/configs/jetty/src/plan/plan.xml
    geronimo/trunk/configs/jsp-examples-jetty/pom.xml
    geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
    geronimo/trunk/configs/online-deployer/pom.xml
    geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
    geronimo/trunk/configs/openejb/src/plan/plan.xml
    geronimo/trunk/configs/remote-deploy-jetty/pom.xml
    geronimo/trunk/configs/remote-deploy-tomcat/pom.xml
    geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
    geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
    geronimo/trunk/configs/shutdown/pom.xml
    geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
    geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
    geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml
    geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java
    geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
    geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java
    geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
    geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java

Modified: geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq-broker/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/activemq-broker/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -17,7 +17,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<!--               parentId="${pom.groupId}/system-database/${pom.currentVersion}/car"
+<!--               parentId="${pom.groupId}/system-database/${pom.version}/car"
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 

Modified: geronimo/trunk/configs/axis/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/axis/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/axis/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -23,7 +23,7 @@
 
 This module should contain those services normally provided
 by the server.
-               parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
+               parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
 
 -->
 <module

Modified: geronimo/trunk/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-corba/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -65,11 +65,11 @@
     <!--
     <gbean name="SSLClientCert" class="org.openejb.corba.CSSBeanGBean">
         <reference name="ThreadPool">
-            <module>geronimo/client/${pom.currentVersion}/car</module>
+            <module>geronimo/client/${pom.version}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionManager">
-            <module>geronimo/client/${pom.currentVersion}/car</module>
+            <module>geronimo/client/${pom.version}/car</module>
             <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -107,11 +107,11 @@
 
     <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBeanGBean">
         <reference name="ThreadPool">
-            <module>geronimo/client/${pom.currentVersion}/car</module>
+            <module>geronimo/client/${pom.version}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionManager">
-            <module>geronimo/client/${pom.currentVersion}/car</module>
+            <module>geronimo/client/${pom.version}/car</module>
             <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -149,11 +149,11 @@
 
     <gbean name="NoSecurity" class="org.openejb.corba.CSSBeanGBean">
         <reference name="ThreadPool">
-            <module>geronimo/client/${pom.currentVersion}/car</module>
+            <module>geronimo/client/${pom.version}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionManager">
-            <module>geronimo/client/${pom.currentVersion}/car</module>
+            <module>geronimo/client/${pom.version}/car</module>
             <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>

Modified: geronimo/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-deployer/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-deployer/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -52,7 +52,7 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>j2ee-server</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                 </dependencies>
@@ -64,7 +64,7 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>client</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                 </dependencies>

Modified: geronimo/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-system/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/pom.xml (original)
+++ geronimo/trunk/configs/client-system/pom.xml Sat Aug 12 03:22:18 2006
@@ -34,20 +34,37 @@
     <packaging>car</packaging>
     
     <dependencies>
-
-        <!-- To Do - are the deps of g-system needed in the plan.xml ? -->
+        
+        <!--
+        TODO: Check which of these dependencies we need listed here.
+        -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
         
-        <!-- need qname_spec ? -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xmlParserAPIs</artifactId>
@@ -56,29 +73,112 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <classPath>
-                        <element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
-                        <element>../lib/geronimo-common-${pom.version}.jar</element>
-                        <element>../lib/geronimo-kernel-${pom.version}.jar</element>
-                        <element>../lib/geronimo-system-${pom.version}.jar</element>
-                        <element>../lib/geronimo-util-${pom.version}.jar</element>
-                        <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
-                        <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
-                        <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
-                        <element>../lib/log4j-${log4jVersion}.jar</element>
-                        <element>../lib/mx4j-${mx4jVersion}.jar</element>
-                        <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
-                        <element>../lib/endorsed/xercesImpl-${xercesVersion}.jar</element>
-                        <element>../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar</element>
-                        <element>../lib/xpp3-${xpp3Version}.jar</element>
-                        <element>../lib/xstream-${xstreamVersion}.jar</element>
-                    </classPath>
-                    <mainClass>org.apache.geronimo.system.main.ClientCommandLine</mainClass>
+                    <archive>
+                        <manifestEntries>
+                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
+                            <Extension-Dirs>lib/ext</Extension-Dirs>
+                        </manifestEntries>
+                        <manifest>
+                            <mainClass>org.apache.geronimo.system.main.ClientCommandLine</mainClass>
+                        </manifest>
+                    </archive>
+                    
+                    <!--
+                    NOTE: This list of dependencies is non-transitive.
+                    -->
+                    <classpath>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-common</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-kernel</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-system</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-util</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-qname_1.1_spec</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j-remote</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-cli</groupId>
+                            <artifactId>commons-cli</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-logging</groupId>
+                            <artifactId>commons-logging</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib-nodep</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>log4j</groupId>
+                            <artifactId>log4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>jline</groupId>
+                            <artifactId>jline</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xpp3</groupId>
+                            <artifactId>xpp3</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xstream</groupId>
+                            <artifactId>xstream</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xerces</groupId>
+                            <artifactId>xercesImpl</artifactId>
+                            <classpathPrefix>../lib/endorsed</classpathPrefix>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xerces</groupId>
+                            <artifactId>xmlParserAPIs</artifactId>
+                            <classpathPrefix>../lib/endorsed</classpathPrefix>
+                        </classpathElement>
+                    </classpath>
+                    <classpathPrefix>../lib</classpathPrefix>
                 </configuration>
             </plugin>
         </plugins>

Added: geronimo/trunk/configs/client-system/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-system/src/main/resources/META-INF/startup-jar?rev=431008&view=auto
==============================================================================
--- geronimo/trunk/configs/client-system/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/trunk/configs/client-system/src/main/resources/META-INF/startup-jar Sat Aug 12 03:22:18 2006
@@ -0,0 +1,2 @@
+This file tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file

Modified: geronimo/trunk/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/client/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -23,7 +23,7 @@
 
 This module should contain those services normally provided
 by the app client.
-               parentId="${pom.groupId}/client-system/${pom.currentVersion}/car"
+               parentId="${pom.groupId}/client-system/${pom.version}/car"
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 

Modified: geronimo/trunk/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-jetty/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/pom.xml (original)
+++ geronimo/trunk/configs/console-jetty/pom.xml Sat Aug 12 03:22:18 2006
@@ -210,7 +210,6 @@
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
-                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-tomcat/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/console-tomcat/pom.xml Sat Aug 12 03:22:18 2006
@@ -210,7 +210,6 @@
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
-                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -508,7 +508,7 @@
                 <moduleId>
                     <groupId>${pom.groupId}</groupId>
                     <artifactId>${pom.artifactId}-streamer-client</artifactId>
-                    <version>${pom.currentVersion}</version>
+                    <version>${pom.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -516,12 +516,12 @@
                 <moduleId>
                     <groupId>${pom.groupId}</groupId>
                     <artifactId>${pom.artifactId}-streamer-client-server</artifactId>
-                    <version>${pom.currentVersion}</version>
+                    <version>${pom.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
             <resource>
-                <external-rar>geronimo/ge-activemq-rar/${pom.currentVersion}/rar</external-rar>
+                <external-rar>geronimo/ge-activemq-rar/${pom.version}/rar</external-rar>
                 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
                     <resourceadapter>
                         <resourceadapter-instance>
@@ -609,7 +609,7 @@
 
     <ext-module>
         <connector>TradeJMS</connector>
-        <external-path>geronimo/ge-activemq-rar/${pom.currentVersion}/rar</external-path>
+        <external-path>geronimo/ge-activemq-rar/${pom.version}/rar</external-path>
         <connector  xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
 
             <resourceadapter>

Modified: geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -508,7 +508,7 @@
                 <moduleId>
                     <groupId>${pom.groupId}</groupId>
                     <artifactId>${pom.artifactId}-streamer-client</artifactId>
-                    <version>${pom.currentVersion}</version>
+                    <version>${pom.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -516,12 +516,12 @@
                 <moduleId>
                     <groupId>${pom.groupId}</groupId>
                     <artifactId>${pom.artifactId}-streamer-client-server</artifactId>
-                    <version>${pom.currentVersion}</version>
+                    <version>${pom.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
             <resource>
-                <external-rar>geronimo/ge-activemq-rar/${pom.currentVersion}/rar</external-rar>
+                <external-rar>geronimo/ge-activemq-rar/${pom.version}/rar</external-rar>
                 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
                     <resourceadapter>
                         <resourceadapter-instance>
@@ -609,7 +609,7 @@
 
     <ext-module>
         <connector>TradeJMS</connector>
-        <external-path>geronimo/ge-activemq-rar/${pom.currentVersion}/rar</external-path>
+        <external-path>geronimo/ge-activemq-rar/${pom.version}/rar</external-path>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
 
             <resourceadapter>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml Sat Aug 12 03:22:18 2006
@@ -74,7 +74,7 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <boot>true</boot>
+                    <bootstrap>true</bootstrap>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -30,7 +30,7 @@
 
     <!-- Builder for handling plans defining Geronimo modules -->
     <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
-        <!--<attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>-->
+        <!--<attribute name="defaultParentId">geronimo/j2ee-server/${pom.version}/car</attribute>-->
         <reference name="Repository">
             <!--<pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>-->
             <!--<pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>-->

Modified: geronimo/trunk/configs/hot-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/hot-deployer/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/hot-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/hot-deployer/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -19,8 +19,8 @@
 <!-- $Rev$ $Date$ -->
 
 <!--
-Child of the geronimo/j2ee-server/${pom.currentVersion}/car module that includes deployment services
-    parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
+Child of the geronimo/j2ee-server/${pom.version}/car module that includes deployment services
+    parentId="geronimo/runtime-deployer/${pom.version}/car"
 -->
 <module
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"

Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -78,7 +78,7 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>j2ee-server</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                 </dependencies>
@@ -112,7 +112,7 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>j2ee-server</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                 </dependencies>

Modified: geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-security/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-security/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -20,7 +20,7 @@
 
 <!--
 Configuration for the security of a Geronimo server.
-               parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
+               parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
 -->
 <module
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"

Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -23,7 +23,7 @@
 
 This module should contain those services normally provided
 by the server.
-               parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
+               parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
 
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">

Modified: geronimo/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-system/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-system/pom.xml Sat Aug 12 03:22:18 2006
@@ -33,8 +33,11 @@
     <packaging>car</packaging>
     
     <dependencies>
-    
-        <!-- uses geronimo-gbean-deployer by default -->
+        
+        <!--
+        TODO: Check which of these dependencies we need listed here.
+        -->
+        
         <!-- this forces gbean-deployer to be built before j2ee-system -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -44,45 +47,165 @@
             <scope>provided</scope>
         </dependency>
         
-        <!-- dependencies referenced in the plan g-k, g-common -->
-        <!-- g-common, g-kernel, cglib, commons-logging, log4j,
-             mx4j, mx4j-remote, g-qname_spec, xercesImpl, xmlParserAPIS,
-             xstream, xpp3 comming from this -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        
+        <!--
+        FIXME: These need to be picked up from lib/endorsed
+        -->
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+        
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <classPath>
-                        <element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
-                        <element>../lib/geronimo-common-${pom.version}.jar</element>
-                        <element>../lib/geronimo-kernel-${pom.version}.jar</element>
-                        <element>../lib/geronimo-system-${pom.version}.jar</element>
-                        <element>../lib/geronimo-util-${pom.version}.jar</element>
-                        <element>../lib/backport-util-concurrent-${backportUtilVersion}.jar</element>
-                        <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
-                        <element>../lib/concurrent-${concurrentVersion}.jar</element>
-                        <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
-                        <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
-                        <element>../lib/log4j-${log4jVersion}.jar</element>
-                        <element>../lib/mx4j-${mx4jVersion}.jar</element>
-                        <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
-                        <element>../lib/endorsed/xercesImpl-${xercesVersion}.jar</element>
-                        <element>../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar</element>
-                        <element>../lib/xpp3-${xpp3Version}.jar</element>
-                        <element>../lib/xstream-${xstreamVersion}.jar</element>
-                    </classPath>
-                    <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
-                    <logLevel>DEBUG</logLevel>
+                    <archive>
+                        <manifestEntries>
+                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
+                            <Extension-Dirs>lib/ext</Extension-Dirs>
+                        </manifestEntries>
+                        <manifest>
+                            <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
+                        </manifest>
+                    </archive>
+                    
+                    <!--
+                    NOTE: This list of dependencies is non-transitive.
+                    -->
+                    <classpath>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-common</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-kernel</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-system</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-util</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-qname_1.1_spec</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j-remote</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-cli</groupId>
+                            <artifactId>commons-cli</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-logging</groupId>
+                            <artifactId>commons-logging</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib-nodep</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>log4j</groupId>
+                            <artifactId>log4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>jline</groupId>
+                            <artifactId>jline</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xpp3</groupId>
+                            <artifactId>xpp3</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xstream</groupId>
+                            <artifactId>xstream</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>backport-util-concurrent</groupId>
+                            <artifactId>backport-util-concurrent</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>concurrent</groupId>
+                            <artifactId>concurrent</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xerces</groupId>
+                            <artifactId>xercesImpl</artifactId>
+                            <classpathPrefix>../lib/endorsed</classpathPrefix>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xerces</groupId>
+                            <artifactId>xmlParserAPIs</artifactId>
+                            <classpathPrefix>../lib/endorsed</classpathPrefix>
+                        </classpathElement>
+                    </classpath>
+                    <classpathPrefix>../lib</classpathPrefix>
                 </configuration>
             </plugin>
         </plugins>

Added: geronimo/trunk/configs/j2ee-system/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-system/src/main/resources/META-INF/startup-jar?rev=431008&view=auto
==============================================================================
--- geronimo/trunk/configs/j2ee-system/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/trunk/configs/j2ee-system/src/main/resources/META-INF/startup-jar Sat Aug 12 03:22:18 2006
@@ -0,0 +1,2 @@
+This file tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file

Modified: geronimo/trunk/configs/javamail/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/javamail/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/javamail/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/javamail/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -19,8 +19,8 @@
 <!-- $Rev$ $Date$ -->
 
 <!--
-Child of the geronimo/j2ee-server/${pom.currentVersion}/car module that includes deployment services
-    parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
+Child of the geronimo/j2ee-server/${pom.version}/car module that includes deployment services
+    parentId="geronimo/runtime-deployer/${pom.version}/car"
 -->
 <module
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"

Modified: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -47,13 +47,13 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>j2ee-server</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>jetty</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                 </dependencies>

Modified: geronimo/trunk/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -20,7 +20,7 @@
 
 <!--
 Configuration for Jetty server.
-               parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
+               parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
 -->
 <module
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"

Modified: geronimo/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-jetty/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/pom.xml Sat Aug 12 03:22:18 2006
@@ -83,7 +83,6 @@
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
-                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-tomcat/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/pom.xml Sat Aug 12 03:22:18 2006
@@ -78,7 +78,6 @@
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
-                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/online-deployer/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/trunk/configs/online-deployer/pom.xml Sat Aug 12 03:22:18 2006
@@ -32,31 +32,158 @@
     <name>Geronimo Configs :: Online Deployer</name>
     <packaging>car</packaging>
     
+    <dependencies>
+        
+        <!--
+        TODO: Check which of these dependencies we need listed here.
+        -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+    
+    </dependencies>
+    
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <classPath>
-                        <element>../lib/geronimo-deployment-${pom.version}.jar</element>
-                        <element>../lib/xpp3-${xpp3_version}.jar</element>
-                        <element>../lib/xstream-${xstream_version}.jar</element>
-                        <element>../lib/geronimo-deploy-jsr88-${pom.version}.jar</element>
-                        <element>../lib/geronimo-deploy-tool-${pom.version}.jar</element>
-                        <element>../lib/geronimo-j2ee-deployment_${geronimoSpecJ2eeDeploymentVersion}_spec.jar</element>
-                        <element>../lib/geronimo-common-${pom.version}.jar</element>
-                        <element>../lib/geronimo-kernel-${pom.version}.jar</element>
-                        <element>../lib/geronimo-system-${pom.version}.jar</element>
-                        <element>../lib/geronimo-util-${pom.version}.jar</element>
-                        <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
-                        <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
-                        <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
-                        <element>../lib/log4j-${log4jVersion}.jar</element>
-                        <element>../lib/mx4j-${mx4jVersion}.jar</element>
-                        <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
-                    </classPath>
-                    <mainClass>org.apache.geronimo.deployment.cli.DeployTool</mainClass>
+                    <archive>
+                        <manifestEntries>
+                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
+                            <Extension-Dirs>lib/ext</Extension-Dirs>
+                        </manifestEntries>
+                        <manifest>
+                            <mainClass>org.apache.geronimo.deployment.cli.DeployTool</mainClass>
+                        </manifest>
+                    </archive>
+                    
+                    <!--
+                    NOTE: This list of dependencies is non-transitive.
+                    -->
+                    <classpath>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-common</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-kernel</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-system</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-util</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deployment</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deploy-jsr88</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deploy-tool</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j-remote</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-cli</groupId>
+                            <artifactId>commons-cli</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-logging</groupId>
+                            <artifactId>commons-logging</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib-nodep</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>log4j</groupId>
+                            <artifactId>log4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>jline</groupId>
+                            <artifactId>jline</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xpp3</groupId>
+                            <artifactId>xpp3</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xstream</groupId>
+                            <artifactId>xstream</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xerces</groupId>
+                            <artifactId>xercesImpl</artifactId>
+                            <classpathPrefix>../lib/endorsed</classpathPrefix>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xerces</groupId>
+                            <artifactId>xmlParserAPIs</artifactId>
+                            <classpathPrefix>../lib/endorsed</classpathPrefix>
+                        </classpathElement>
+                    </classpath>
+                    <classpathPrefix>../lib</classpathPrefix>
                 </configuration>
             </plugin>
         </plugins>

Added: geronimo/trunk/configs/online-deployer/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/online-deployer/src/main/resources/META-INF/startup-jar?rev=431008&view=auto
==============================================================================
--- geronimo/trunk/configs/online-deployer/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/trunk/configs/online-deployer/src/main/resources/META-INF/startup-jar Sat Aug 12 03:22:18 2006
@@ -0,0 +1,2 @@
+This file tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file

Modified: geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -42,7 +42,7 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>openejb</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                     <dependency>

Modified: geronimo/trunk/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -23,7 +23,7 @@
 
 This module should contain those services normally provided
 by the server.
-               parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
+               parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
 
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">

Modified: geronimo/trunk/configs/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-jetty/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/pom.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/pom.xml Sat Aug 12 03:22:18 2006
@@ -63,7 +63,6 @@
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-remote-deploy/${geronimoVersion}/geronimo-remote-deploy-${geronimoVersion}.war</moduleFile>
-                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-tomcat/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/pom.xml Sat Aug 12 03:22:18 2006
@@ -63,7 +63,6 @@
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-remote-deploy/${geronimoVersion}/geronimo-remote-deploy-${geronimoVersion}.war</moduleFile>
-                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/rmi-naming/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -21,7 +21,7 @@
 <!--
 Holds the RMI naming server module.  This needs to be started
 after the system GBeans but before the server GBeans.
-    parentId="${pom.groupId}/j2ee-system/${pom.currentVersion}/car"
+    parentId="${pom.groupId}/j2ee-system/${pom.version}/car"
 
 -->
 <module

Modified: geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-tomcat/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/pom.xml Sat Aug 12 03:22:18 2006
@@ -92,7 +92,6 @@
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
-                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/shutdown/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/shutdown/pom.xml (original)
+++ geronimo/trunk/configs/shutdown/pom.xml Sat Aug 12 03:22:18 2006
@@ -33,26 +33,95 @@
     <packaging>car</packaging>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+            
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <classPath>
-                        <element>../lib/geronimo-deploy-tool-${pom.version}.jar</element>
-                        <element>../lib/geronimo-common-${pom.version}.jar</element>
-                        <element>../lib/geronimo-kernel-${pom.version}.jar</element>
-                        <element>../lib/geronimo-system-${pom.version}.jar</element>
-                        <element>../lib/geronimo-util-${pom.version}.jar</element>
-                        <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
-                        <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
-                        <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
-                        <element>../lib/log4j-${log4jVersion}.jar</element>
-                        <element>../lib/mx4j-${mx4jVersion}.jar</element>
-                        <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
-                        <element>../lib/jline-${jlineVersion}.jar</element>
-                    </classPath>
-                    <mainClass>org.apache.geronimo.deployment.cli.StopServer</mainClass>
+                    <archive>
+                        <manifestEntries>
+                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
+                            <Extension-Dirs>lib/ext</Extension-Dirs>
+                        </manifestEntries>
+                        <manifest>
+                            <mainClass>org.apache.geronimo.deployment.cli.StopServer</mainClass>
+                        </manifest>
+                    </archive>
+                    
+                    <!--
+                    NOTE: This list of dependencies is non-transitive.
+                    -->
+                    <classpath>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deploy-tool</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-common</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-kernel</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-system</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-util</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j-remote</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-cli</groupId>
+                            <artifactId>commons-cli</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-logging</groupId>
+                            <artifactId>commons-logging</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib-nodep</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>log4j</groupId>
+                            <artifactId>log4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>jline</groupId>
+                            <artifactId>jline</artifactId>
+                        </classpathElement>
+                    </classpath>
+                    <classpathPrefix>../lib</classpathPrefix>
                 </configuration>
             </plugin>
         </plugins>

Added: geronimo/trunk/configs/shutdown/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/shutdown/src/main/resources/META-INF/startup-jar?rev=431008&view=auto
==============================================================================
--- geronimo/trunk/configs/shutdown/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/trunk/configs/shutdown/src/main/resources/META-INF/startup-jar Sat Aug 12 03:22:18 2006
@@ -0,0 +1,2 @@
+This file tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file

Modified: geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -36,13 +36,13 @@
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>j2ee-server</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>tomcat</artifactId>
-                        <!--<version>${pom.currentVersion}</version>-->
+                        <!--<version>${pom.version}</version>-->
                         <type>car</type>
                     </dependency>
                 </dependencies>

Modified: geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -21,7 +21,7 @@
 
     <ext-module>
         <web>uddi-jetty</web>
-        <external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
+        <external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.version}/war</external-path>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
 
             <context-root>/juddi</context-root>

Modified: geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml Sat Aug 12 03:22:18 2006
@@ -21,7 +21,7 @@
 
     <ext-module>
         <web>uddi-tomcat</web>
-        <external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
+        <external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.version}/war</external-path>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
 
             <context-root>/juddi</context-root>

Modified: geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml Sat Aug 12 03:22:18 2006
@@ -36,12 +36,6 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -69,17 +63,22 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        
+
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
         </dependency>
-
+        
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-archiver</artifactId>
+            <!--
+            FIXME: 2.1 is broken... won't allow custom manifestEntires, need to use
+                   this snap until 2.2 is released.
+            -->
+            <version>2.2-SNAPSHOT</version>
         </dependency>
-
+        
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
@@ -87,22 +86,11 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-qname_1.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
         </dependency>
@@ -120,7 +108,13 @@
         <dependency>
             <groupId>xpp3</groupId>
             <artifactId>xpp3</artifactId>
-        </dependency> 
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java (original)
+++ geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java Sat Aug 12 03:22:18 2006
@@ -155,4 +155,15 @@
         output.flush();
         output.close();
     }
+
+    protected static File getArchiveFile(final File basedir, final String finalName, String classifier) {
+        if (classifier == null) {
+            classifier = "";
+        }
+        else if (classifier.trim().length() > 0 && !classifier.startsWith("-")) {
+            classifier = "-" + classifier;
+        }
+
+        return new File(basedir, finalName + classifier + ".car");
+    }
 }

Added: geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java?rev=431008&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java (added)
+++ geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java Sat Aug 12 03:22:18 2006
@@ -0,0 +1,165 @@
+/**
+ *  Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
+
+package org.apache.geronimo.plugin.car;
+
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * Builds a Geronimo Configuration using the local Maven infrastructure.
+ *
+ * @version $Rev:385659 $ $Date$
+ */
+public class ClasspathElement
+{
+    /**
+     * Group Id of artifact.
+     *
+     * @parameter
+     * @required
+     */
+    private String groupId;
+
+    /**
+     * Name of artifact.
+     *
+     * @parameter
+     * @required
+     */
+    private String artifactId;
+
+    /**
+     * Version of artifact.
+     *
+     * @parameter
+     */
+    private String version = null;
+
+    /**
+     * Type of artifact.
+     *
+     * @parameter
+     * @required
+     */
+    private String type = "jar";
+
+    /**
+     * Classifier for artifact.
+     *
+     * @parameter
+     */
+    private String classifier;
+
+    /**
+     * Prefix to be prepended to the artifact, like <tt>../lib</tt>.
+     *
+     * @parameter
+     */
+    private String classpathPrefix;
+
+    /**
+     * Artifact Item
+     */
+    private Artifact artifact;
+
+    public String toString() {
+        return groupId + ":" + artifactId + ":" + classifier + ":" + version + ":" + type;
+    }
+
+    /**
+     * @return Returns the artifactId.
+     */
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    /**
+     * @param artifactId The artifactId to set.
+     */
+    public void setArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+    }
+
+    /**
+     * @return Returns the groupId.
+     */
+    public String getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * @param groupId The groupId to set.
+     */
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    /**
+     * @return Returns the type.
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @param type The type to set.
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * @return Returns the version.
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * @param version The version to set.
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * @return Classifier.
+     */
+    public String getClassifier() {
+        return classifier;
+    }
+
+    /**
+     * @param classifier Classifier.
+     */
+    public void setClassifier(String classifier) {
+        this.classifier = classifier;
+    }
+
+    /**
+     * @return Returns the classpath prefix.
+     */
+    public String getClasspathPrefix() {
+        return classpathPrefix;
+    }
+
+    /**
+     * @param classpathPrefix   The classpath prefix
+     */
+    public void setClasspathPrefix(String classpathPrefix) {
+        this.classpathPrefix = classpathPrefix;
+    }
+}
\ No newline at end of file

Propchange: geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java?rev=431008&r1=431007&r2=431008&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java (original)
+++ geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java Sat Aug 12 03:22:18 2006
@@ -1,6 +1,5 @@
 /**
- *
- * Copyright 2005 The Apache Software Foundation
+ *  Copyright 2005 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -45,7 +44,6 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
 import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
-import org.apache.geronimo.plugin.car.MavenAttributeStore;
 
 /**
  * Builds a Geronimo Configuration using the local Maven infrastructure.
@@ -54,8 +52,6 @@
  */
 public class PackageBuilder
 {
-    private static Log log = LogFactory.getLog(PackageBuilder.class);
-
     private static final String KERNEL_NAME = "geronimo.maven";
 
     private static final String[] ARG_TYPES = {
@@ -74,6 +70,8 @@
         String.class.getName(),
     };
 
+    private static final Log log = LogFactory.getLog(PackageBuilder.class);
+
     /**
      * Reference to the kernel that will last the lifetime of this classloader.
      * The KernelRegistry keeps soft references that may be garbage collected.
@@ -106,28 +104,10 @@
 
     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;
     }
@@ -241,67 +221,6 @@
         this.packageFile = packageFile;
     }
 
-    public String getMainClass() {
-        return mainClass;
-    }
-
-    /**
-     * Set the name of the class containing the main method for a executable configuration.
-     *
-     * @param mainClass
-     */
-    public void setMainClass(final String mainClass) {
-        this.mainClass = mainClass;
-    }
-
-    public String getMainGBean() {
-        return mainGBean;
-    }
-
-    public void setMainGBean(final String mainGBean) {
-        this.mainGBean = mainGBean;
-    }
-
-    public String getMainMethod() {
-        return mainMethod;
-    }
-
-    public void setMainMethod(final String mainMethod) {
-        this.mainMethod = mainMethod;
-    }
-
-    public String getConfigurations() {
-        return configurations;
-    }
-
-    public void setConfigurations(final String configurations) {
-        this.configurations = configurations;
-    }
-
-    public String getClassPath() {
-        return classPath;
-    }
-
-    public void setClassPath(final String classPath) {
-        this.classPath = classPath;
-    }
-
-    public String getEndorsedDirs() {
-        return endorsedDirs;
-    }
-
-    public void setEndorsedDirs(final String endorsedDirs) {
-        this.endorsedDirs = endorsedDirs;
-    }
-
-    public String getExtensionDirs() {
-        return extensionDirs;
-    }
-
-    public void setExtensionDirs(final String extensionDirs) {
-        this.extensionDirs = extensionDirs;
-    }
-
     public String getExplicitResolutionLocation() {
         return explicitResolutionLocation;
     }
@@ -310,16 +229,8 @@
         this.explicitResolutionLocation = explicitResolutionLocation;
     }
 
-    public String getLogLevel() {
-        return logLevel;
-    }
-
-    public void setLogLevel(String logLevel) {
-        this.logLevel = logLevel;
-    }
-
     public void execute() throws Exception {
-        System.out.println("Packaging configuration " + planFile);
+        System.out.println("Packaging module configuration: " + planFile);
 
         try {
             Kernel kernel = createKernel();
@@ -344,8 +255,6 @@
 
             AbstractName deployer = locateDeployer(kernel);
             invokeDeployer(kernel, deployer, targetConfigStoreAName.toString());
-
-            System.out.println("Generated package " + packageFile);
         }
         catch (Exception e) {
             log.error(e.getClass().getName() + ": " + e.getMessage(), e);
@@ -354,19 +263,15 @@
     }
 
     private void setTargetConfigStore() throws Exception {
-        try {
-            kernel.stopGBean(targetRepositoryAName);
-            kernel.setAttribute(targetRepositoryAName, "root", targetRepository.toURI());
-            kernel.startGBean(targetRepositoryAName);
-            if (kernel.getGBeanState(targetConfigStoreAName) != State.RUNNING_INDEX) {
-                throw new IllegalStateException("After restarted repository then config store is not running");
-            }
-            targetSet = true;
-        }
-        catch (Exception e) {
-            log.error(e.toString(), e);
-            throw e;
+        kernel.stopGBean(targetRepositoryAName);
+        kernel.setAttribute(targetRepositoryAName, "root", targetRepository.toURI());
+        kernel.startGBean(targetRepositoryAName);
+
+        if (kernel.getGBeanState(targetConfigStoreAName) != State.RUNNING_INDEX) {
+            throw new IllegalStateException("After restarted repository then config store is not running");
         }
+
+        targetSet = true;
     }
 
     /**
@@ -384,7 +289,7 @@
             return kernel;
         }
 
-        GeronimoLogging geronimoLogging = GeronimoLogging.getGeronimoLogging(logLevel);
+        GeronimoLogging geronimoLogging = GeronimoLogging.getGeronimoLogging("WARN");
         if (geronimoLogging == null) {
             geronimoLogging = GeronimoLogging.DEBUG;
         }
@@ -426,7 +331,6 @@
         targetRepositoryAName = targetRepoGBean.getAbstractName();
 
         GBeanData artifactManagerGBean = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
-
         GBeanData artifactResolverGBean = bootstrap.addGBean("ArtifactResolver", ExplicitDefaultArtifactResolver.GBEAN_INFO);
         artifactResolverGBean.setAttribute("versionMapLocation", explicitResolutionLocation);
         ReferencePatterns repoPatterns = new ReferencePatterns(repoNames);
@@ -455,7 +359,6 @@
         targetSet = true;
 
         GBeanData attrManagerGBean = bootstrap.addGBean("AttributeStore", MavenAttributeStore.GBEAN_INFO);
-
         GBeanData configManagerGBean = bootstrap.addGBean("ConfigManager", KernelConfigurationManager.GBEAN_INFO);
         configManagerGBean.setReferencePatterns("Stores", new ReferencePatterns(storeNames));
         configManagerGBean.setReferencePattern("AttributeStore", attrManagerGBean.getAbstractName());
@@ -474,7 +377,7 @@
      *
      * @throws IllegalStateException if there is not exactly one GBean matching the deployerName pattern
      */
-    private AbstractName locateDeployer(Kernel kernel) {
+    private AbstractName locateDeployer(final Kernel kernel) {
         Iterator i = kernel.listGBeans(new AbstractNameQuery(deployerName)).iterator();
         if (!i.hasNext()) {
             throw new IllegalStateException("No deployer found matching deployerName: " + deployerName);
@@ -488,22 +391,20 @@
         return deployer;
     }
 
-    private List invokeDeployer(Kernel kernel, AbstractName deployer, String targetConfigStore) throws Exception {
-        boolean isExecutable = mainClass != null;
-
+    private List invokeDeployer(final Kernel kernel, final AbstractName deployer, final String targetConfigStore) throws Exception {
         Object[] args = {
-            Boolean.FALSE,
+            Boolean.FALSE, // Not in-place
             planFile,
             moduleFile,
-            singleArtifact ? packageFile : null,
-            Boolean.valueOf(!isExecutable),
-            mainClass,
-            mainGBean,
-            mainMethod,
-            configurations,
-            classPath,
-            endorsedDirs,
-            extensionDirs,
+            null, // Target file
+            Boolean.TRUE, // Install
+            null, // main-class
+            null, // main-gbean
+            null, // main-method
+            null, // Manifest configurations
+            null, // class-path
+            null, // endorsed-dirs
+            null, // extension-dirs
             targetConfigStore
         };
 



Mime
View raw message