geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r395709 [1/2] - in /geronimo/branches/1.1: configs/activemq-broker/ configs/activemq/ configs/axis-deployer/ configs/axis/ configs/client-corba/ configs/client-deployer/ configs/client-security/ configs/client-system/ configs/client/ config...
Date Thu, 20 Apr 2006 22:02:54 GMT
Author: djencks
Date: Thu Apr 20 15:02:48 2006
New Revision: 395709

URL: http://svn.apache.org/viewcvs?rev=395709&view=rev
Log:
GERONIMO-1875 use separate openejb-builder plan.  Improve packagin plugin, now you say what configs to start in project.xml

Modified:
    geronimo/branches/1.1/configs/activemq-broker/project.properties
    geronimo/branches/1.1/configs/activemq-broker/project.xml
    geronimo/branches/1.1/configs/activemq/project.xml
    geronimo/branches/1.1/configs/axis-deployer/project.properties
    geronimo/branches/1.1/configs/axis-deployer/project.xml
    geronimo/branches/1.1/configs/axis/project.properties
    geronimo/branches/1.1/configs/axis/project.xml
    geronimo/branches/1.1/configs/client-corba/project.properties
    geronimo/branches/1.1/configs/client-corba/project.xml
    geronimo/branches/1.1/configs/client-deployer/project.properties
    geronimo/branches/1.1/configs/client-deployer/project.xml
    geronimo/branches/1.1/configs/client-security/project.properties
    geronimo/branches/1.1/configs/client-security/project.xml
    geronimo/branches/1.1/configs/client-system/project.properties
    geronimo/branches/1.1/configs/client-system/project.xml
    geronimo/branches/1.1/configs/client/project.properties
    geronimo/branches/1.1/configs/client/project.xml
    geronimo/branches/1.1/configs/console-jetty/project.properties
    geronimo/branches/1.1/configs/console-jetty/project.xml
    geronimo/branches/1.1/configs/console-tomcat/project.properties
    geronimo/branches/1.1/configs/console-tomcat/project.xml
    geronimo/branches/1.1/configs/daytrader-jetty/project.properties
    geronimo/branches/1.1/configs/daytrader-jetty/project.xml
    geronimo/branches/1.1/configs/daytrader-tomcat/project.properties
    geronimo/branches/1.1/configs/daytrader-tomcat/project.xml
    geronimo/branches/1.1/configs/directory/project.properties
    geronimo/branches/1.1/configs/directory/project.xml
    geronimo/branches/1.1/configs/hot-deployer/project.xml
    geronimo/branches/1.1/configs/j2ee-corba/project.properties
    geronimo/branches/1.1/configs/j2ee-corba/project.xml
    geronimo/branches/1.1/configs/j2ee-deployer/project.properties
    geronimo/branches/1.1/configs/j2ee-deployer/project.xml
    geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/j2ee-security/project.properties
    geronimo/branches/1.1/configs/j2ee-security/project.xml
    geronimo/branches/1.1/configs/j2ee-server/project.properties
    geronimo/branches/1.1/configs/j2ee-server/project.xml
    geronimo/branches/1.1/configs/j2ee-system/project.properties
    geronimo/branches/1.1/configs/j2ee-system/project.xml
    geronimo/branches/1.1/configs/javamail/project.xml
    geronimo/branches/1.1/configs/jetty-deployer/project.properties
    geronimo/branches/1.1/configs/jetty-deployer/project.xml
    geronimo/branches/1.1/configs/jetty/project.properties
    geronimo/branches/1.1/configs/jetty/project.xml
    geronimo/branches/1.1/configs/jmxdebug-jetty/project.properties
    geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml
    geronimo/branches/1.1/configs/jmxdebug-tomcat/project.properties
    geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml
    geronimo/branches/1.1/configs/jsp-examples-jetty/project.properties
    geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml
    geronimo/branches/1.1/configs/jsp-examples-tomcat/project.properties
    geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml
    geronimo/branches/1.1/configs/ldap-demo-jetty/project.properties
    geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml
    geronimo/branches/1.1/configs/ldap-demo-tomcat/project.properties
    geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml
    geronimo/branches/1.1/configs/ldap-realm/project.properties
    geronimo/branches/1.1/configs/ldap-realm/project.xml
    geronimo/branches/1.1/configs/online-deployer/project.xml
    geronimo/branches/1.1/configs/openejb-deployer/project.properties
    geronimo/branches/1.1/configs/openejb-deployer/project.xml
    geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/openejb/project.properties
    geronimo/branches/1.1/configs/openejb/project.xml
    geronimo/branches/1.1/configs/remote-deploy-jetty/project.properties
    geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml
    geronimo/branches/1.1/configs/remote-deploy-tomcat/project.properties
    geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml
    geronimo/branches/1.1/configs/rmi-naming/project.properties
    geronimo/branches/1.1/configs/rmi-naming/project.xml
    geronimo/branches/1.1/configs/servlets-examples-jetty/project.properties
    geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml
    geronimo/branches/1.1/configs/servlets-examples-tomcat/project.properties
    geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml
    geronimo/branches/1.1/configs/sharedlib/project.properties
    geronimo/branches/1.1/configs/sharedlib/project.xml
    geronimo/branches/1.1/configs/shutdown/project.xml
    geronimo/branches/1.1/configs/system-database/project.properties
    geronimo/branches/1.1/configs/system-database/project.xml
    geronimo/branches/1.1/configs/tomcat-deployer/project.properties
    geronimo/branches/1.1/configs/tomcat-deployer/project.xml
    geronimo/branches/1.1/configs/tomcat/project.properties
    geronimo/branches/1.1/configs/tomcat/project.xml
    geronimo/branches/1.1/configs/uddi-jetty/project.properties
    geronimo/branches/1.1/configs/uddi-jetty/project.xml
    geronimo/branches/1.1/configs/uddi-tomcat/project.xml
    geronimo/branches/1.1/configs/unavailable-client-deployer/project.properties
    geronimo/branches/1.1/configs/unavailable-client-deployer/project.xml
    geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/unavailable-ejb-deployer/project.xml
    geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/unavailable-webservices-deployer/project.xml
    geronimo/branches/1.1/configs/welcome-jetty/project.xml
    geronimo/branches/1.1/configs/welcome-tomcat/project.xml
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.jelly
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java

Modified: geronimo/branches/1.1/configs/activemq-broker/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq-broker/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq-broker/project.properties (original)
+++ geronimo/branches/1.1/configs/activemq-broker/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/branches/1.1/configs/activemq-broker/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq-broker/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq-broker/project.xml (original)
+++ geronimo/branches/1.1/configs/activemq-broker/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/activemq/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq/project.xml (original)
+++ geronimo/branches/1.1/configs/activemq/project.xml Thu Apr 20 15:02:48 2006
@@ -37,12 +37,18 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/axis-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/axis-deployer/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/axis-deployer/project.properties (original)
+++ geronimo/branches/1.1/configs/axis-deployer/project.properties Thu Apr 20 15:02:48 2006
@@ -20,6 +20,3 @@
 ##
 
 maven.multiproject.type=car
-
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car

Modified: geronimo/branches/1.1/configs/axis-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/axis-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/axis-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/axis-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -38,6 +38,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/axis/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/axis/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/axis/project.properties (original)
+++ geronimo/branches/1.1/configs/axis/project.properties Thu Apr 20 15:02:48 2006
@@ -21,9 +21,6 @@
 
 maven.multiproject.type=car
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/branches/1.1/configs/axis/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/axis/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/axis/project.xml (original)
+++ geronimo/branches/1.1/configs/axis/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/client-corba/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-corba/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-corba/project.properties (original)
+++ geronimo/branches/1.1/configs/client-corba/project.properties Thu Apr 20 15:02:48 2006
@@ -25,8 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car
-
 PlanCOSNamingHost=localhost
 PlanCOSNamingPort=1050
 PlanORBSSLHost=localhost

Modified: geronimo/branches/1.1/configs/client-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-corba/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-corba/project.xml (original)
+++ geronimo/branches/1.1/configs/client-corba/project.xml Thu Apr 20 15:02:48 2006
@@ -37,12 +37,27 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/client-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-deployer/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-deployer/project.properties (original)
+++ geronimo/branches/1.1/configs/client-deployer/project.properties Thu Apr 20 15:02:48 2006
@@ -21,5 +21,3 @@
 
 maven.multiproject.type=car
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car

Modified: geronimo/branches/1.1/configs/client-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/client-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -38,9 +38,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
-            <!--<properties>-->
-                <!--<geronimo.import>true</geronimo.import>-->
-            <!--</properties>-->
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/client-security/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-security/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-security/project.properties (original)
+++ geronimo/branches/1.1/configs/client-security/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-#j2ee-deployer needed for login config xml-reference builder
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/branches/1.1/configs/client-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-security/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-security/project.xml (original)
+++ geronimo/branches/1.1/configs/client-security/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,18 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/client-system/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-system/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-system/project.properties (original)
+++ geronimo/branches/1.1/configs/client-system/project.properties Thu Apr 20 15:02:48 2006
@@ -25,11 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
-
-
 geronimo.packaging.classPath= \
     ../lib/geronimo-qname_1.1_spec-${geronimo_spec_qname_version}.jar \
     ../lib/geronimo-common-${geronimo_version}.jar \

Modified: geronimo/branches/1.1/configs/client-system/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-system/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-system/project.xml (original)
+++ geronimo/branches/1.1/configs/client-system/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- dependencies referenced in the plan -->

Modified: geronimo/branches/1.1/configs/client/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client/project.properties (original)
+++ geronimo/branches/1.1/configs/client/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanNamingPort=1099
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/branches/1.1/configs/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client/project.xml (original)
+++ geronimo/branches/1.1/configs/client/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/console-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/console-jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/geronimo-console-${geronimo_version}.ear
 

Modified: geronimo/branches/1.1/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,19 +37,38 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>jetty-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
+        </dependency>
+
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/console-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/project.properties (original)
+++ geronimo/branches/1.1/configs/console-tomcat/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/geronimo-console-${geronimo_version}.ear
 

Modified: geronimo/branches/1.1/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,7 +37,11 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
+<!-- should be in default env.
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>tomcat</artifactId>
@@ -47,17 +51,33 @@
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
+-->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>tomcat-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/daytrader-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${daytrader_version}.ear
 

Modified: geronimo/branches/1.1/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,20 +37,49 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>jetty-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
         </dependency>
-        <!-- parent config -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
+        </dependency>
+<!--
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+-->
+         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-server</artifactId>

Modified: geronimo/branches/1.1/configs/daytrader-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/project.properties (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${daytrader_version}.ear
 

Modified: geronimo/branches/1.1/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,20 +37,49 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>tomcat-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
         </dependency>
-        <!-- parent config -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
+        </dependency>
+<!--
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+-->
+         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-server</artifactId>

Modified: geronimo/branches/1.1/configs/directory/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/directory/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/directory/project.properties (original)
+++ geronimo/branches/1.1/configs/directory/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/branches/1.1/configs/directory/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/directory/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/directory/project.xml (original)
+++ geronimo/branches/1.1/configs/directory/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/hot-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/hot-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/hot-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/hot-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -32,7 +32,16 @@
             <version>${geronimo_packaging_plugin_version}</version>
             <type>plugin</type>
         </dependency>
-
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
+        </dependency>
+       
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>rmi-naming</artifactId>

Modified: geronimo/branches/1.1/configs/j2ee-corba/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-corba/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-corba/project.properties (original)
+++ geronimo/branches/1.1/configs/j2ee-corba/project.properties Thu Apr 20 15:02:48 2006
@@ -30,9 +30,6 @@
 PlanORBSSLHost=localhost
 PlanORBSSLPort=2001
 
-#j2ee-deployer needed for login config xml-reference builder
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/branches/1.1/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-corba/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-corba/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-corba/project.xml Thu Apr 20 15:02:48 2006
@@ -37,8 +37,29 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
-        <!-- parent config -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-server</artifactId>

Modified: geronimo/branches/1.1/configs/j2ee-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/project.properties (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/project.properties Thu Apr 20 15:02:48 2006
@@ -25,5 +25,3 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car

Modified: geronimo/branches/1.1/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -40,6 +40,7 @@
             <type>car</type>
             <properties>
                 <geronimo.import>true</geronimo.import>
+                <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
         <dependency>
@@ -57,7 +58,7 @@
             <artifactId>client</artifactId>
             <version>${pom.currentVersion}</version>
             <!--<properties>-->
-                <!--<geronimo.import>true</geronimo.import>-->
+            <!--<geronimo.import>true</geronimo.import>-->
             <!--</properties>-->
         </dependency>
         <dependency>

Modified: geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml Thu Apr 20 15:02:48 2006
@@ -16,9 +16,8 @@
     limitations under the License.
 -->
 
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
-        >
+<!-- $Rev$ $Date$ -->
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
         <!--domain set to wildcard so datasources may be deployed independently on client. -->
@@ -35,9 +34,14 @@
         <reference name="WebConfigBuilder">
             <name>WebBuilder</name>
         </reference>
-        <reference name="EJBConfigBuilder">
-            <name>EJBBuilder</name>
-        </reference>
+        <references name="EJBConfigBuilder">
+            <pattern>
+                <name>EJBBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableEJBBuilder</name>
+            </pattern>
+        </references>
         <reference name="ConnectorConfigBuilder">
             <name>ConnectorBuilder</name>
         </reference>
@@ -50,9 +54,14 @@
         <reference name="ServiceReferenceBuilder">
             <name>WebServiceBuilder</name>
         </reference>
-        <reference name="EJBReferenceBuilder">
-            <name>ServerEJBReferenceBuilder</name>
-        </reference>
+        <references name="EJBReferenceBuilder">
+            <pattern>
+                <name>ServerEJBReferenceBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableEJBReferenceBuilder</name>
+            </pattern>
+        </references>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>
@@ -80,28 +89,6 @@
         </references>
     </gbean>
 
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="listener">?name=WebContainer</attribute>
-        <reference name="WebServiceLinkTemplate">
-            <name>WebServiceEJBLinkTemplate</name>
-        </reference>
-        <reference name="WebServiceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-                <dependencies>
-                    <dependency>
-                        <groupId>${pom.groupId}</groupId>
-                        <artifactId>j2ee-server</artifactId>
-                        <version>${pom.currentVersion}</version>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-    </gbean>
-
     <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
         <attribute name="defaultMaxSize">10</attribute>
         <attribute name="defaultMinSize">0</attribute>
@@ -127,9 +114,14 @@
         <attribute name="transactionContextManagerObjectName">?name=TransactionContextManager</attribute>
         <attribute name="connectionTrackerObjectName">?name=ConnectionTracker</attribute>
         <attribute name="corbaGBeanObjectName">?name=Server</attribute>
-        <reference name="EJBReferenceBuilder">
-            <name>ClientEJBReferenceBuilder</name>
-        </reference>
+        <references name="EJBReferenceBuilder">
+            <pattern>
+                <name>ClientEJBReferenceBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableClientEJBReferenceBuilder</name>
+            </pattern>
+        </references>
         <reference name="ConnectorModuleBuilder">
             <name>ConnectorBuilder</name>
         </reference>
@@ -165,17 +157,12 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
-    <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
     <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
         <attribute name="policyConfigurationFactory">
             org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
-    <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
-    <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEJBReferenceBuilder"/>
     <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
-    <gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
 
 </configuration>

Modified: geronimo/branches/1.1/configs/j2ee-security/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/project.properties (original)
+++ geronimo/branches/1.1/configs/j2ee-security/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-#j2ee-deployer needed for login config xml-reference builder
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car
-
 PlanJMXPort=9999
 PlanNamingPort=1099
 PlanHTTPPort=8080

Modified: geronimo/branches/1.1/configs/j2ee-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-security/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,18 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/j2ee-server/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/project.properties (original)
+++ geronimo/branches/1.1/configs/j2ee-server/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/branches/1.1/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/j2ee-system/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-system/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-system/project.properties (original)
+++ geronimo/branches/1.1/configs/j2ee-system/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 geronimo.packaging.classPath= \
     ../lib/geronimo-qname_1.1_spec-${geronimo_spec_qname_version}.jar \
     ../lib/geronimo-common-${geronimo_version}.jar \

Modified: geronimo/branches/1.1/configs/j2ee-system/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-system/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-system/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-system/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- dependencies referenced in the plan -->
@@ -44,33 +47,33 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${geronimo_version}</version>
-           <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-         </dependency>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimo_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${geronimo_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -82,56 +85,56 @@
             <artifactId>commons-logging</artifactId>
             <version>${commons_logging_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
             <version>${mx4j_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j-remote</artifactId>
             <version>${mx4j_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <version>${xerces_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xmlParserAPIs</artifactId>
             <version>${xml_parser_apis_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
 
         <dependency>
@@ -139,8 +142,8 @@
             <artifactId>xstream</artifactId>
             <version>${xstream_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
 
         <dependency>
@@ -148,8 +151,8 @@
             <artifactId>xpp3</artifactId>
             <version>${xpp3_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/branches/1.1/configs/javamail/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/javamail/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/javamail/project.xml (original)
+++ geronimo/branches/1.1/configs/javamail/project.xml Thu Apr 20 15:02:48 2006
@@ -32,6 +32,15 @@
             <version>${geronimo_packaging_plugin_version}</version>
             <type>plugin</type>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
+        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/jetty-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty-deployer/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty-deployer/project.properties (original)
+++ geronimo/branches/1.1/configs/jetty-deployer/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/branches/1.1/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/jetty-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanAJPPort2=8019

Modified: geronimo/branches/1.1/configs/jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/jmxdebug-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jmxdebug-jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jmxdebug-jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/jmxdebug-jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${geronimo_version}.war
 

Modified: geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>jetty-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/jmxdebug-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jmxdebug-tomcat/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jmxdebug-tomcat/project.properties (original)
+++ geronimo/branches/1.1/configs/jmxdebug-tomcat/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${geronimo_version}.war
 

Modified: geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>tomcat-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/jsp-examples-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/jsp-examples-jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,8 +25,6 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-jsp-examples-tomcat-${tomcat_jsp_examples_version}.war
 
 

Modified: geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>jetty-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/jsp-examples-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-tomcat/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-tomcat/project.properties (original)
+++ geronimo/branches/1.1/configs/jsp-examples-tomcat/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-jsp-examples-tomcat-${tomcat_jsp_examples_version}.war
 

Modified: geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>tomcat-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/ldap-demo-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/ldap-demo-jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-ldap-demo-${geronimo_version}.war
 

Modified: geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>jetty-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
         </dependency>
 
         <!-- parent config -->

Modified: geronimo/branches/1.1/configs/ldap-demo-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-tomcat/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-tomcat/project.properties (original)
+++ geronimo/branches/1.1/configs/ldap-demo-tomcat/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-ldap-demo-${geronimo_version}.war
 

Modified: geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,20 +37,38 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>tomcat-deployer</artifactId>
+            <artifactId>jetty-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
         </dependency>
-
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
+        </dependency>
+         
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/ldap-realm/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/project.properties (original)
+++ geronimo/branches/1.1/configs/ldap-realm/project.properties Thu Apr 20 15:02:48 2006
@@ -25,6 +25,4 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
 

Modified: geronimo/branches/1.1/configs/ldap-realm/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-realm/project.xml Thu Apr 20 15:02:48 2006
@@ -37,8 +37,11 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
-        <!-- parent config -->
+         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-security</artifactId>

Modified: geronimo/branches/1.1/configs/online-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/online-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/online-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/online-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -32,6 +32,15 @@
             <version>${geronimo_packaging_plugin_version}</version>
             <type>plugin</type>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
+        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/openejb-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/project.properties (original)
+++ geronimo/branches/1.1/configs/openejb-deployer/project.properties Thu Apr 20 15:02:48 2006
@@ -21,8 +21,5 @@
 
 maven.multiproject.type=car
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanOpenEJBPort=4201
 PlanServerHostname=localhost

Modified: geronimo/branches/1.1/configs/openejb-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/openejb-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -30,7 +30,16 @@
             <version>${geronimo_packaging_plugin_version}</version>
             <type>plugin</type>
         </dependency>
-
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
+        </dependency>
+        
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml Thu Apr 20 15:02:48 2006
@@ -16,6 +16,8 @@
     limitations under the License.
 -->
 
+<!-- $Rev: 378404 $ $Date: 2006-02-16 19:17:27 -0500 (Thu, 16 Feb 2006) $ -->
+
 <configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
 
@@ -32,7 +34,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
-                        <artifactId>j2ee-server</artifactId>
+                        <artifactId>openejb</artifactId>
                         <version>${pom.currentVersion}</version>
                         <type>car</type>
                     </dependency>

Modified: geronimo/branches/1.1/configs/openejb/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb/project.properties (original)
+++ geronimo/branches/1.1/configs/openejb/project.properties Thu Apr 20 15:02:48 2006
@@ -21,9 +21,6 @@
 
 maven.multiproject.type=car
 
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/branches/1.1/configs/openejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb/project.xml (original)
+++ geronimo/branches/1.1/configs/openejb/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/remote-deploy-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/remote-deploy-jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/remote-deploy-jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/remote-deploy-jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -43,19 +43,39 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>1</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>2</packaging.config.order>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>jetty-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
+        </dependency>
+
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>

Modified: geronimo/branches/1.1/configs/remote-deploy-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/remote-deploy-tomcat/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/remote-deploy-tomcat/project.properties (original)
+++ geronimo/branches/1.1/configs/remote-deploy-tomcat/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
 # Also will cause all config projects to be grouped together when imported into eclipse.
 maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
-
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 



Mime
View raw message