You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/09/29 21:42:04 UTC

svn commit: r700221 [2/3] - in /geronimo/site/trunk/docs/plugins: geronimo-2.2/geronimo-plugins.xml plugin-repository-list-2.2.txt samples-2.2/ samples-2.2/geronimo-plugins.xml

Modified: geronimo/site/trunk/docs/plugins/geronimo-2.2/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/plugins/geronimo-2.2/geronimo-plugins.xml?rev=700221&r1=700220&r2=700221&view=diff
==============================================================================
--- geronimo/site/trunk/docs/plugins/geronimo-2.2/geronimo-plugins.xml (original)
+++ geronimo/site/trunk/docs/plugins/geronimo-2.2/geronimo-plugins.xml Mon Sep 29 12:42:03 2008
@@ -2,6 +2,8 @@
 <geronimo-plugin-list xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <plugin>
         <name>Geronimo Framework, Configs :: GBean Deployer Boostrap</name>
+        <category>Geronimo Core</category>
+        <pluginGroup>false</pluginGroup>
         <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
@@ -15,27 +17,31 @@
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Framework, Configs :: J2EE System</name>
-        <category>Geronimo Core</category>
-        <description>Base geronimo server that sets up the kernel.</description>
-        <url>http://geronimo.apache.org/</url>
-        <author>The Apache Geronimo development community</author>
-        <license osi-approved="true">The Apache Software License, Version 2.0</license>
-        <plugin-artifact>
-            <module-id>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>j2ee-system</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>commons-jexl</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.3.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-reflect</artifactId>
+                <version>3.4.1</version>
+                <type>jar</type>
+            </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
@@ -44,613 +50,746 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-system</artifactId>
+                <artifactId>geronimo-kernel</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
+                <groupId>xml-resolver</groupId>
+                <artifactId>xml-resolver</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.1_3</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-crypto</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>2.2.3</version>
+                <groupId>xpp3</groupId>
+                <artifactId>xpp3_min</artifactId>
+                <version>1.1.4c</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>asm</groupId>
-                <artifactId>asm-commons</artifactId>
-                <version>2.2.3</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deploy-config</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
-                <version>1.0</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>0.9.91</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>commons-jexl</groupId>
-                <artifactId>commons-jexl</artifactId>
-                <version>1.1</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deployment</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>ognl</groupId>
-                <artifactId>ognl</artifactId>
-                <version>2.6.9</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-system</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.1</version>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>1.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.1</version>
+                <groupId>asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>2.2.3</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.15</version>
                 <type>jar</type>
             </dependency>
-            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Framework, Configs :: XMLBeans</name>
-        <category>Geronimo Core</category>
-        <description>Geronimo module that supplies the xmlbeans framework in a single classloader.</description>
-        <url>http://geronimo.apache.org/</url>
-        <author>The Apache Geronimo development community</author>
-        <license osi-approved="true">The Apache Software License, Version 2.0</license>
-        <plugin-artifact>
-            <module-id>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>j2ee-system</artifactId>
-                <type>car</type>
+                <artifactId>geronimo-cli</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.xmlbeans</groupId>
-                <artifactId>xmlbeans</artifactId>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-service-builder</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+            <artifact-alias key="org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap//car">org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/2.2-SNAPSHOT/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Framework, Configs :: JavaEE Specs</name>
-        <category>JavaEE</category>
-        <description>The JavaEE spec jars in a single classloader.</description>
+        <name>Geronimo Framework, Configs :: J2EE System</name>
+        <category>Geronimo Core</category>
+        <pluginGroup>false</pluginGroup>
+        <description>Base geronimo server that sets up the kernel.</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>jee-specs</artifactId>
+                <artifactId>j2ee-system</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>j2ee-system</artifactId>
-                <type>car</type>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-activation_1.1_spec</artifactId>
+                <groupId>commons-jexl</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>1.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                <groupId>com.envoisolutions.sxc</groupId>
+                <artifactId>sxc-jaxb</artifactId>
+                <version>0.7.2</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-reflect</artifactId>
+                <version>3.4.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-el_1.0_spec</artifactId>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl104-over-slf4j</artifactId>
+                <version>1.5.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-common</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+                <artifactId>geronimo-activation_1.1_spec</artifactId>
+                <version>1.0.2</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>jline</groupId>
+                <artifactId>jline</artifactId>
+                <version>0.9.94</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jacc_1.1_spec</artifactId>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.javamail</groupId>
-                <artifactId>geronimo-javamail_1.4_mail</artifactId>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.5.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jms_1.1_spec</artifactId>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>1.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                <groupId>asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jsp_2.1_spec</artifactId>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.15</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.1_spec</artifactId>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.7</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-kernel</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.1_3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-jaxws-api</artifactId>
+                <groupId>xpp3</groupId>
+                <artifactId>xpp3_min</artifactId>
+                <version>1.1.4c</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-saaj-api</artifactId>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>jstl</groupId>
-                <artifactId>jstl</artifactId>
+                <groupId>com.envoisolutions.sxc</groupId>
+                <artifactId>sxc-runtime</artifactId>
+                <version>0.7.2</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-api</artifactId>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-jdbc</artifactId>
+                <artifactId>geronimo-system</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-transformer</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-cli</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+            <artifact-alias key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/j2ee-system/2.2-SNAPSHOT/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Framework, Configs :: RMI Naming</name>
-        <category>Geronimo Core</category>
-        <description>Fundamental geronimo services including the plugin installer.</description>
+        <name>Geronimo Framework, Configs :: JavaEE Specs</name>
+        <category>JavaEE</category>
+        <pluginGroup>false</pluginGroup>
+        <description>The JavaEE spec jars in a single classloader.</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>rmi-naming</artifactId>
+                <artifactId>jee-specs</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>j2ee-system</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
+                <groupId>org.apache.geronimo.javamail</groupId>
+                <artifactId>geronimo-javamail_1.4_mail</artifactId>
+                <version>1.6</version>
+                <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>jee-specs</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                <version>1.1.1</version>
+                <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-management</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-core</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-interceptor</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-el_1.0_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-naming</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jms_1.1_spec</artifactId>
+                <version>1.1.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-crypto</artifactId>
+                <artifactId>geronimo-jdbc</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-naming</artifactId>
-                <version>3.3</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jacc_1.1_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
-            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <config-xml-content>
-                <ns2:gbean name="RMIRegistry">
-                    <ns2:attribute name="port">${NamingPort + PortOffset}</ns2:attribute>
-                </ns2:gbean>
-                <ns2:gbean name="NamingProperties">
-                    <ns2:attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort + PortOffset}</ns2:attribute>
-                </ns2:gbean>
-                <ns2:gbean name="DefaultThreadPool">
-                    <ns2:attribute name="keepAliveTime">30000</ns2:attribute>
-                    <ns2:attribute name="minPoolSize">${MinThreadPoolSize}</ns2:attribute>
-                    <ns2:attribute name="maxPoolSize">${MaxThreadPoolSize}</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
-            <config-substitution key="ServerHostname">localhost</config-substitution>
-            <config-substitution key="PortOffset">0</config-substitution>
-            <config-substitution key="NamingPort">1099</config-substitution>
-            <config-substitution key="MinThreadPoolSize">200</config-substitution>
-            <config-substitution key="MaxThreadPoolSize">500</config-substitution>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Framework, Configs :: Plugin Management</name>
-        <category>Geronimo Core</category>
-        <description>Plugin management services including the installer.</description>
-        <url>http://geronimo.apache.org/</url>
-        <author>The Apache Geronimo development community</author>
-        <license osi-approved="true">The Apache Software License, Version 2.0</license>
-        <plugin-artifact>
-            <module-id>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>plugin</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>rmi-naming</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>ejb31-api-experimental</artifactId>
+                <version>3.1-20080924.211708-13</version>
+                <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-plugin</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.myfaces.core</groupId>
+                <artifactId>myfaces-api</artifactId>
+                <version>1.2.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jsp_2.1_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-config</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                <version>1.1.2</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                <version>1.0</version>
+                <artifactId>geronimo-concurrent_1.0_spec</artifactId>
+                <version>1.0-20080804.214102-1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>jstl</groupId>
+                <artifactId>jstl</artifactId>
+                <version>1.2</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+                <version>2.0.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaspi_1.0_spec</artifactId>
+                <version>1.0-20080804.213256-1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                <version>1.1.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>xmlbeans</artifactId>
+                <artifactId>j2ee-system</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-archiver</artifactId>
-                <version>1.0-alpha-7</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+                <version>2.0.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-utils</artifactId>
-                <version>1.4.1</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+                <version>2.0.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-container-default</artifactId>
-                <version>1.0-alpha-9</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-component-api</artifactId>
-                <version>1.0-alpha-15</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jta_1.1_spec</artifactId>
+                <version>1.1.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-saaj_1.3_spec</artifactId>
+                <version>1.0.1-20080910.021327-1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_3.0_spec</artifactId>
+                <version>1.0-EA-20080711.180136-1</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <config-xml-content>
-                <ns2:gbean name="DownloadedPluginRepos">
-                    <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.2.txt</ns2:attribute>
-                    <ns2:attribute name="userRepositories">~/.m2/repository</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
+            <artifact-alias key="org.apache.geronimo.framework/jee-specs//car">org.apache.geronimo.framework/jee-specs/2.2-SNAPSHOT/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Framework, Configs :: GBean Deployer</name>
+        <name>Geronimo Framework, Configs :: RMI Naming</name>
         <category>Geronimo Core</category>
-        <description>The GBean Deployer</description>
+        <pluginGroup>false</pluginGroup>
+        <description>Fundamental geronimo services including the plugin installer.</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
+                <artifactId>rmi-naming</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>xmlbeans</artifactId>
+                <artifactId>geronimo-naming</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-common</artifactId>
+                <artifactId>geronimo-interceptor</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deployment</artifactId>
+                <artifactId>geronimo-management</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-service-builder</artifactId>
+                <artifactId>jee-specs</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-core</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>plugin</artifactId>
+                <artifactId>j2ee-system</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
+            <dependency>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-naming</artifactId>
+                <version>3.4.1</version>
+                <type>jar</type>
+            </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
             <config-xml-content>
-                <ns2:gbean name="Deployer">
-                    <ns2:attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPort + PortOffset}</ns2:attribute>
+                <ns2:gbean name="RMIRegistry">
+                    <ns2:attribute name="port">${NamingPort + PortOffset}</ns2:attribute>
+                </ns2:gbean>
+                <ns2:gbean name="NamingProperties">
+                    <ns2:attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort + PortOffset}</ns2:attribute>
+                </ns2:gbean>
+                <ns2:gbean name="DefaultThreadPool">
+                    <ns2:attribute name="keepAliveTime">30000</ns2:attribute>
+                    <ns2:attribute name="minPoolSize">${MinThreadPoolSize}</ns2:attribute>
+                    <ns2:attribute name="maxPoolSize">${MaxThreadPoolSize}</ns2:attribute>
                 </ns2:gbean>
             </config-xml-content>
-            <config-xml-content server="offline"/>
-            <config-substitution key="RemoteDeployHostname">localhost</config-substitution>
+            <artifact-alias key="org.apache.geronimo.framework/rmi-naming//car">org.apache.geronimo.framework/rmi-naming/2.2-SNAPSHOT/car</artifact-alias>
+            <config-substitution key="ServerHostname">localhost</config-substitution>
+            <config-substitution key="PortOffset">0</config-substitution>
+            <config-substitution key="NamingPort">1099</config-substitution>
+            <config-substitution key="MinThreadPoolSize">200</config-substitution>
+            <config-substitution key="MaxThreadPoolSize">500</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Framework, Configs :: Client System</name>
+        <name>Geronimo Framework, Configs :: XMLBeans</name>
         <category>Geronimo Core</category>
-        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+        <pluginGroup>false</pluginGroup>
+        <description>Geronimo module that supplies the xmlbeans framework in a single classloader.</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>client-system</artifactId>
+                <artifactId>xmlbeans</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-common</artifactId>
-                <version>2.2-SNAPSHOT</version>
+            <jvm-version>1.6</jvm-version>
+            <dependency start="true">
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.3.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency>
+            <dependency start="true">
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-system</artifactId>
+                <artifactId>j2ee-system</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>jar</type>
+                <type>car</type>
             </dependency>
+            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+            <artifact-alias key="org.apache.geronimo.framework/xmlbeans//car">org.apache.geronimo.framework/xmlbeans/2.2-SNAPSHOT/car</artifact-alias>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>geronimo-javaee-deployment_1.1MR3_spec classloader</name>
+        <category>Classloaders</category>
+        <pluginGroup>false</pluginGroup>
+        <description>Plugins that are only classloaders, with no services.  These typically are used to share classes among several independent services.</description>
+        <url>http://geronimo.apache.org/</url>
+        <author>The Apache Geronimo development community</author>
+        <license osi-approved="true">The Apache Software License, Version 2.0</license>
+        <plugin-artifact>
+            <module-id>
+                <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
+            <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-crypto</artifactId>
+                <artifactId>geronimo-deploy-config</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
+            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+            <artifact-alias key="org.apache.geronimo.plugins.classloaders/geronimo-javaee-deployment_1.1MR3_spec//car">org.apache.geronimo.plugins.classloaders/geronimo-javaee-deployment_1.1MR3_spec/2.2-SNAPSHOT/car</artifact-alias>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Framework, Configs :: Plugin Management</name>
+        <category>Geronimo Core</category>
+        <pluginGroup>false</pluginGroup>
+        <description>Plugin management services including the installer.</description>
+        <url>http://geronimo.apache.org/</url>
+        <author>The Apache Geronimo development community</author>
+        <license osi-approved="true">The Apache Software License, Version 2.0</license>
+        <plugin-artifact>
+            <module-id>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
+            <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
-                <groupId>jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>0.9.91</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>commons-jexl</groupId>
-                <artifactId>commons-jexl</artifactId>
-                <version>1.1</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>1.4.5</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>ognl</groupId>
-                <artifactId>ognl</artifactId>
-                <version>2.6.9</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-archiver</artifactId>
+                <version>1.0-alpha-7</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-container-default</artifactId>
+                <version>1.0-alpha-32</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
-                <type>jar</type>
+                <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.1</version>
-                <type>jar</type>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.1</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-component-api</artifactId>
+                <version>1.0-alpha-32</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <config-xml-content load="false"/>
-            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/2.2-SNAPSHOT/car</artifact-alias>
-            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/2.2-SNAPSHOT/car">org.apache.geronimo.framework/client-system/2.2-SNAPSHOT/car</artifact-alias>
+            <copy-file dest-dir="schema">schema/xsd/</copy-file>
+            <copy-file relative-to="server" dest-dir="var/config">plugin-repositories.properties</copy-file>
+            <config-xml-content>
+                <ns2:gbean name="DownloadedPluginRepos">
+                    <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.2.txt</ns2:attribute>
+                </ns2:gbean>
+            </config-xml-content>
+            <artifact-alias key="org.apache.geronimo.framework/plugin//car">org.apache.geronimo.framework/plugin/2.2-SNAPSHOT/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Framework, Configs :: J2EE Security</name>
-        <category>Security</category>
-        <description>Basic Geronimo server security infrastructure</description>
+        <name>Geronimo Framework, Configs :: GBean Deployer</name>
+        <category>Geronimo Core</category>
+        <pluginGroup>false</pluginGroup>
+        <description>The GBean Deployer</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>j2ee-security</artifactId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>rmi-naming</artifactId>
+                <artifactId>geronimo-deployment</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-security</artifactId>
+                <artifactId>xmlbeans</artifactId>
                 <version>2.2-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>xml-resolver</groupId>
+                <artifactId>xml-resolver</artifactId>
+                <version>1.1</version>
                 <type>jar</type>
             </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-jmx-remoting</artifactId>
+                <artifactId>geronimo-service-builder</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
@@ -658,19 +797,19 @@
             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
             <config-xml-content>
-                <ns2:gbean name="JMXService">
-                    <ns2:attribute name="protocol">rmi</ns2:attribute>
-                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
-                    <ns2:attribute name="port">${JMXPort + PortOffset}</ns2:attribute>
-                    <ns2:attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort + PortOffset}/JMXConnector</ns2:attribute>
+                <ns2:gbean name="Deployer">
+                    <ns2:attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPort + PortOffset}</ns2:attribute>
                 </ns2:gbean>
             </config-xml-content>
-            <config-substitution key="JMXPort">9999</config-substitution>
+            <config-xml-content server="offline"/>
+            <artifact-alias key="org.apache.geronimo.framework/geronimo-gbean-deployer//car">org.apache.geronimo.framework/geronimo-gbean-deployer/2.2-SNAPSHOT/car</artifact-alias>
+            <config-substitution key="RemoteDeployHostname">localhost</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Framework, Configs :: JSR-88 CLI</name>
-        <category>Deployment</category>
+        <name>Geronimo Framework, Configs :: Client System</name>
+        <category>Geronimo Core</category>
+        <pluginGroup>false</pluginGroup>
         <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
@@ -678,17 +817,42 @@
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>jsr88-cli</artifactId>
+                <artifactId>client-system</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>commons-jexl</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-reflect</artifactId>
+                <version>3.4.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.7</version>
+                <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
@@ -698,138 +862,181 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-system</artifactId>
+                <artifactId>geronimo-kernel</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-crypto</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.1_3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-activation_1.1_spec</artifactId>
+                <version>1.0.2</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-cli</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>jline</groupId>
+                <artifactId>jline</artifactId>
+                <version>0.9.94</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-tool</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>xpp3</groupId>
+                <artifactId>xpp3_min</artifactId>
+                <version>1.1.4c</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-config</artifactId>
+                <artifactId>geronimo-crypto</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                <version>1.0</version>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
-                <version>1.0</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>0.9.91</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-system</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.0</version>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>1.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.1</version>
+                <groupId>asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.1</version>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.15</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-cli</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <config-xml-content server="jsr88"/>
+            <config-xml-content load="false"/>
+            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/2.2-SNAPSHOT/car</artifact-alias>
+            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/2.2-SNAPSHOT/car">org.apache.geronimo.framework/client-system/2.2-SNAPSHOT/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Framework, Configs :: JSR-88 DeploymentFactory</name>
-        <category>Deployment</category>
-        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+        <name>Geronimo Framework, Configs :: J2EE Security</name>
+        <category>Security</category>
+        <pluginGroup>false</pluginGroup>
+        <description>Basic Geronimo server security infrastructure</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>jsr88-deploymentfactory</artifactId>
+                <artifactId>j2ee-security</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-common</artifactId>
+                <artifactId>geronimo-security</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-crypto</artifactId>
+                <artifactId>geronimo-jmx-remoting</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-system</artifactId>
+                <artifactId>rmi-naming</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>jar</type>
+                <type>car</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-jaspi</artifactId>
+                <version>1.0-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency>
+            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+            <config-xml-content>
+                <ns2:gbean name="JMXService">
+                    <ns2:attribute name="protocol">rmi</ns2:attribute>
+                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
+                    <ns2:attribute name="port">${JMXPort + PortOffset}</ns2:attribute>
+                    <ns2:attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort + PortOffset}/JMXConnector</ns2:attribute>
+                </ns2:gbean>
+            </config-xml-content>
+            <artifact-alias key="org.apache.geronimo.framework/j2ee-security//car">org.apache.geronimo.framework/j2ee-security/2.2-SNAPSHOT/car</artifact-alias>
+            <config-substitution key="JMXPort">9999</config-substitution>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Framework, Configs :: JSR-88 CLI</name>
+        <category>Deployment</category>
+        <pluginGroup>false</pluginGroup>
+        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+        <url>http://geronimo.apache.org/</url>
+        <author>The Apache Geronimo development community</author>
+        <license osi-approved="true">The Apache Software License, Version 2.0</license>
+        <plugin-artifact>
+            <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-config</artifactId>
+                <artifactId>jsr88-cli</artifactId>
                 <version>2.2-SNAPSHOT</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
+            <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
@@ -839,57 +1046,35 @@
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.0</version>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.3.0</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-reflect</artifactId>
+                <version>3.4.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.1</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deploy-tool</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.1</version>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.1</version>
                 <type>jar</type>
             </dependency>
-            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <config-xml-content server="jsr88"/>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Framework, Configs :: Online Deployer</name>
-        <category>Deployment</category>
-        <description>Geronimo Online Deployer</description>
-        <url>http://geronimo.apache.org/</url>
-        <author>The Apache Geronimo development community</author>
-        <license osi-approved="true">The Apache Software License, Version 2.0</license>
-        <plugin-artifact>
-            <module-id>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>online-deployer</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
@@ -897,39 +1082,45 @@
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-system</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-activation_1.1_spec</artifactId>
+                <version>1.0.2</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-crypto</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>jline</groupId>
+                <artifactId>jline</artifactId>
+                <version>0.9.94</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-component-api</artifactId>
+                <version>1.0-alpha-32</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-tool</artifactId>
+                <artifactId>geronimo-deploy-jsr88</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-config</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>1.4.5</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                <version>1.0</version>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
@@ -939,124 +1130,118 @@
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>0.9.91</version>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>1.3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>commons-jexl</groupId>
-                <artifactId>commons-jexl</artifactId>
-                <version>1.1</version>
+                <groupId>asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>2.2.3</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.15</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.7</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>ognl</groupId>
-                <artifactId>ognl</artifactId>
-                <version>2.6.9</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-container-default</artifactId>
+                <version>1.0-alpha-32</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-plugin</artifactId>
+                <artifactId>geronimo-kernel</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.0</version>
+                <groupId>xml-resolver</groupId>
+                <artifactId>xml-resolver</artifactId>
+                <version>1.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.1_3</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.1</version>
+                <groupId>xpp3</groupId>
+                <artifactId>xpp3_min</artifactId>
+                <version>1.1.4c</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.1</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-archiver</artifactId>
+                <version>1.0-alpha-7</version>
                 <type>jar</type>
             </dependency>
-            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <config-xml-content load="false"/>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Framework, Configs :: Offline Deployer</name>
-        <category>Deployment</category>
-        <description>Offline deployer</description>
-        <url>http://geronimo.apache.org/</url>
-        <author>The Apache Geronimo development community</author>
-        <license osi-approved="true">The Apache Software License, Version 2.0</license>
-        <plugin-artifact>
-            <module-id>
+            <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>offline-deployer</artifactId>
+                <artifactId>geronimo-deployment</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.0</version>
+                <type>jar</type>
+            </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>online-deployer</artifactId>
+                <artifactId>geronimo-system</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
-            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <config-xml-content load="false"/>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Framework, Configs :: Server Security Configuration</name>
-        <category>Security</category>
-        <description>Sample security configuration for a demo geronimo server. Not suitable for production use.</description>
-        <url>http://geronimo.apache.org/</url>
-        <author>The Apache Geronimo development community</author>
-        <license osi-approved="true">The Apache Software License, Version 2.0</license>
-        <plugin-artifact>
-            <module-id>
+            <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>server-security-config</artifactId>
+                <artifactId>geronimo-cli</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
+                <type>jar</type>
+            </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>j2ee-security</artifactId>
+                <artifactId>geronimo-service-builder</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <copy-file relative-to="server" dest-dir="var">security</copy-file>
+            <config-xml-content server="jsr88"/>
+            <artifact-alias key="org.apache.geronimo.framework/jsr88-cli//car">org.apache.geronimo.framework/jsr88-cli/2.2-SNAPSHOT/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Framework, Configs :: Shutdown</name>
-        <category>Geronimo Core</category>
+        <name>Geronimo Framework, Configs :: JSR-88 DeploymentFactory</name>
+        <category>Deployment</category>
+        <pluginGroup>false</pluginGroup>
         <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
@@ -1064,234 +1249,276 @@
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>shutdown</artifactId>
+                <artifactId>jsr88-deploymentfactory</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.2-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <jvm-version>1.6</jvm-version>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-deploy-tool</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-common</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>jar</type>
+                <groupId>commons-jexl</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-system</artifactId>
+                <artifactId>geronimo-plugin</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-crypto</artifactId>
+                <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
                 <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
-                <version>1.0</version>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-reflect</artifactId>
+                <version>3.4.1</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>0.9.91</version>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.1</version>
                 <type>jar</type>
             </dependency>
-            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-            <config-xml-content load="false"/>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Framework, Configs :: CLI Upgrade</name>
-        <category>Deployment</category>
-        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
-        <url>http://geronimo.apache.org/</url>
-        <author>The Apache Geronimo development community</author>
-        <license osi-approved="true">The Apache Software License, Version 2.0</license>
-        <plugin-artifact>
-            <module-id>
+            <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>upgrade-cli</artifactId>
+                <artifactId>geronimo-common</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-activation_1.1_spec</artifactId>
+                <version>1.0.2</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-component-api</artifactId>
+                <version>1.0-alpha-32</version>
+                <type>jar</type>
+            </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
+                <artifactId>geronimo-deploy-jsr88</artifactId>
                 <version>2.2-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib-nodep</artifactId>
-                <version>2.1_3</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deploy-config</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>

[... 12373 lines stripped ...]