geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221390 [7/8] - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/buildsupport/car-maven-plugin/src/main/resources/M...
Date Tue, 20 Dec 2011 18:05:05 GMT
Modified: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml Tue Dec 20 18:04:59 2011
@@ -50,16 +50,37 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
-            <type>rar</type>
-            <scope>provided</scope>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <type>rar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -91,7 +112,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/server/trunk/plugins/clustering/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,12 +39,32 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <!-- why is deployment needed for clustering??? -->
-            <!--<scope>provided</scope>-->
+            <type>kar</type>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/plugins/clustering/farming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,10 +39,32 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,11 +39,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>
@@ -75,12 +96,12 @@
                 <configuration>
                     <category>Clustering</category>
                     <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
+                            <!--<type>car</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
                     </dependencies>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,10 +39,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
 
         <dependency>
@@ -74,12 +96,12 @@
                 <configuration>
                     <category>Clustering</category>
                     <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
+                            <!--<type>car</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
                     </dependencies>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml Tue Dec 20 18:04:59 2011
@@ -34,13 +34,13 @@
     <packaging>car</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
         
         <!-- parent config -->
         <dependency>

Modified: geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml Tue Dec 20 18:04:59 2011
@@ -38,11 +38,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>
@@ -186,7 +207,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,11 +37,32 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -144,7 +144,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -132,7 +132,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -96,7 +96,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -96,7 +96,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml Tue Dec 20 18:04:59 2011
@@ -170,7 +170,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${openejbDeployer}</deploymentConfig>-->
                         <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml Tue Dec 20 18:04:59 2011
@@ -107,7 +107,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${openejbDeployer}</deploymentConfig>-->
                         <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,11 +39,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,11 +39,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -73,11 +73,32 @@
         </dependency>
 
         <dependency>
-<!-- really? -->
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
 
         <!-- for jspc. why is this needed? -->
@@ -96,7 +117,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -73,11 +73,32 @@
         </dependency>
 
         <dependency>
-<!-- really? -->
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
 
     </dependencies>
@@ -89,7 +110,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java Tue Dec 20 18:04:59 2011
@@ -92,7 +92,7 @@ public abstract class Abstract77Test ext
         super.setUp();
         BundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(), "", new HashMap<Artifact, ConfigurationData>(), null);
         kernel = KernelFactory.newInstance(bundleContext).createKernel(DOMAIN);
-        kernel.boot();
+        kernel.boot(bundleContext);
 
         // server info
         SERVER_INFO_DATA.setAttribute("baseDirectory", System.getProperty("java.io.tmpdir"));

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,10 +39,39 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml Tue Dec 20 18:04:59 2011
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-deployer</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-beta-1-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -18,8 +18,13 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-gbean-deployer</artifactId>
-        <type>car</type>
+        <artifactId>geronimo-deployment</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
@@ -58,6 +63,16 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-ejb_3.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jaxws_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>
@@ -67,13 +82,33 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-saaj_1.3_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-jee</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-bundleutils</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,11 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/j2ee/javaee-builder-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/javaee-builder-support/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/javaee-builder-support/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/javaee-builder-support/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,10 +39,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
 
         <!--<dependency>-->

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml Tue Dec 20 18:04:59 2011
@@ -71,7 +71,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>org.apache.geronimo.configs/javaee-builder-support/${project.version}/car</deploymentConfig>
                     </deploymentConfigs>
                     <category>JavaEE deployment</category>

Modified: geronimo/server/trunk/plugins/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,11 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/javamail/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/javamail/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/javamail/pom.xml (original)
+++ geronimo/server/trunk/plugins/javamail/javamail/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,11 +37,32 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/jetty8/jetty8-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-deployer/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8-deployer/pom.xml Tue Dec 20 18:04:59 2011
@@ -86,7 +86,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>org.apache.geronimo.configs/javaee-builder-support/${project.version}/car</deploymentConfig>
                     </deploymentConfigs>
                     <dependencies>

Modified: geronimo/server/trunk/plugins/jetty8/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,10 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/mejb/mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/mejb/mejb/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/mejb/mejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/mejb/mejb/pom.xml Tue Dec 20 18:04:59 2011
@@ -67,7 +67,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>EJB</category>

Modified: geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml Tue Dec 20 18:04:59 2011
@@ -77,7 +77,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml Tue Dec 20 18:04:59 2011
@@ -69,7 +69,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Monitoring</category>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml Tue Dec 20 18:04:59 2011
@@ -66,7 +66,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Administration Monitoring</category>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -121,7 +121,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -129,7 +129,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,10 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
 
         <!-- parent -->

Modified: geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml Tue Dec 20 18:04:59 2011
@@ -36,19 +36,40 @@
     <description>Geronimo integration of the OpenEJB, to add ejb container in AppClient Container to support ManagedBean in appclient module.</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.1_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -95,7 +95,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -94,7 +94,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Tue Dec 20 18:04:59 2011
@@ -36,19 +36,40 @@
     <description>Geronimo integration of the OpenEJB  ejb container.</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.1_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,11 +39,32 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,11 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
         
         <!-- parent -->

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -107,7 +107,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -99,7 +99,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,11 +39,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>
@@ -148,9 +169,9 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                    </deploymentConfigs>
+                    <!--<deploymentConfigs>-->
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
+                    <!--</deploymentConfigs>-->
                     <category>Portals</category>
                     <osiApproved>true</osiApproved>
                 </configuration>

Modified: geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml Tue Dec 20 18:04:59 2011
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto-support</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-beta-1-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -72,11 +72,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.portals</groupId>
         <artifactId>portlet-api_2.0_spec</artifactId>
         <type>jar</type>
@@ -122,21 +117,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-finder</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -81,7 +81,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -81,7 +81,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml (original)
+++ geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml Tue Dec 20 18:04:59 2011
@@ -36,17 +36,38 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-sharedlib</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
+            <type>kar</type>
         </dependency>
-        
+
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-sharedlib</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml (original)
+++ geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml Tue Dec 20 18:04:59 2011
@@ -36,19 +36,40 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>sharedlib-extender</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
-        
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>sharedlib-extender</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-            <scope>provided</scope>
         </dependency>
+        
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -50,6 +50,35 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>${jetty}-deployer</artifactId>
             <version>${project.version}</version>
@@ -113,12 +142,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -179,7 +202,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,6 +37,35 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
             <version>${project.version}</version>
@@ -100,12 +129,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -157,7 +180,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Tue Dec 20 18:04:59 2011
@@ -39,11 +39,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>
@@ -101,7 +122,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml Tue Dec 20 18:04:59 2011
@@ -115,7 +115,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>org.apache.geronimo.configs/javaee-builder-support/${project.version}/car</deploymentConfig>
                     </deploymentConfigs>
                     <category>Tomcat</category>



Mime
View raw message