geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r590825 [2/2] - /geronimo/site/trunk/docs/plugins/geronimo-2.1/geronimo-plugins.xml
Date Wed, 31 Oct 2007 20:57:19 GMT

Modified: geronimo/site/trunk/docs/plugins/geronimo-2.1/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/plugins/geronimo-2.1/geronimo-plugins.xml?rev=590825&r1=590824&r2=590825&view=diff
==============================================================================
--- geronimo/site/trunk/docs/plugins/geronimo-2.1/geronimo-plugins.xml (original)
+++ geronimo/site/trunk/docs/plugins/geronimo-2.1/geronimo-plugins.xml Wed Oct 31 13:57:18 2007
@@ -301,128 +301,223 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: RMI Naming</name>
+        <name>Geronimo Configs :: XMLBeans</name>
         <category>Geronimo Core</category>
-        <description>Fundamental geronimo services including the plugin installer.</description>
+        <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.configs</groupId>
-                <artifactId>rmi-naming</artifactId>
+                <artifactId>xmlbeans</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
             <dependency start="true">
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.3.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-system</artifactId>
+                <artifactId>jee-specs</artifactId>
                 <version>2.1-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>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Configs :: GBean Deployer</name>
+        <category>Geronimo Core</category>
+        <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.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <jvm-version>1.5</jvm-version>
             <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jee-specs</artifactId>
+                <artifactId>xmlbeans</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-management</artifactId>
+                <artifactId>geronimo-common</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-core</artifactId>
+                <artifactId>geronimo-deployment</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-interceptor</artifactId>
+                <artifactId>geronimo-service-builder</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-naming</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
+                <artifactId>geronimo-deploy-config</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-naming</artifactId>
-                <version>3.2</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">5000</ns2:attribute>
-                    <ns2:attribute name="poolSize">${ThreadPoolSize}</ns2:attribute>
-                </ns2:gbean>
-                <ns2:gbean name="DownloadedPluginRepos">
-                    <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</ns2:attribute>
-                    <ns2:attribute name="userRepositories">~/.m2/repository</ns2:attribute>
+                <ns2:gbean name="Deployer">
+                    <ns2:attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary + PortOffset}</ns2:attribute>
                 </ns2:gbean>
             </config-xml-content>
-            <config-substitution key="ServerHostname">localhost</config-substitution>
-            <config-substitution key="NamingPort">1099</config-substitution>
-            <config-substitution key="ThreadPoolSize">500</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: J2EE Server</name>
-        <category>JavaEE</category>
-        <description>Basic geronimo JavaEE support components including the transaction manager and connector framework.</description>
+        <name>Geronimo Configs :: Client System</name>
+        <category>Geronimo Core</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>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-server</artifactId>
+                <artifactId>client-system</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>rmi-naming</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-common</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-core</artifactId>
+                <artifactId>geronimo-system</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-common</artifactId>
+                <artifactId>geronimo-util</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>jline</groupId>
+                <artifactId>jline</artifactId>
+                <version>0.9.91</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>commons-jexl</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>ognl</groupId>
+                <artifactId>ognl</artifactId>
+                <version>2.6.9</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.0.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-activation_1.1_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>
+            <config-xml-content load="false"/>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Configs :: RMI Naming</name>
+        <category>Geronimo Core</category>
+        <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.configs</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <jvm-version>1.5</jvm-version>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-system</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jee-specs</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-management</artifactId>
                 <version>2.1-SNAPSHOT</version>
@@ -430,38 +525,56 @@
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee</artifactId>
+                <artifactId>geronimo-core</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-webservices</artifactId>
+                <artifactId>geronimo-interceptor</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-reflect</artifactId>
-                <version>3.2</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-naming</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>2.2.3</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-util</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>asm</groupId>
-                <artifactId>asm-commons</artifactId>
-                <version>2.2.3</version>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-naming</artifactId>
+                <version>3.2</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.configs/j2ee-server//car">org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</artifact-alias>
+            <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">5000</ns2:attribute>
+                    <ns2:attribute name="poolSize">${ThreadPoolSize}</ns2:attribute>
+                </ns2:gbean>
+                <ns2:gbean name="DownloadedPluginRepos">
+                    <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</ns2:attribute>
+                    <ns2:attribute name="userRepositories">~/.m2/repository</ns2:attribute>
+                </ns2:gbean>
+            </config-xml-content>
+            <config-substitution key="ServerHostname">localhost</config-substitution>
+            <config-substitution key="NamingPort">1099</config-substitution>
+            <config-substitution key="ThreadPoolSize">500</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
@@ -513,16 +626,16 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Transaction Manager (JTA11)</name>
-        <category>Geronimo Core</category>
-        <description>Geronimo transaction manager module.</description>
+        <name>Geronimo Configs :: JSR88 CLI</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>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>transaction</artifactId>
+                <artifactId>jsr88-cli</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
@@ -530,125 +643,123 @@
             <jvm-version>1.5</jvm-version>
             <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-server</artifactId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-common</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-core</artifactId>
+                <artifactId>geronimo-system</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector</artifactId>
+                <artifactId>geronimo-util</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-connector</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deploy-jsr88</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-transaction</artifactId>
+                <artifactId>geronimo-cli</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-transaction</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deploy-tool</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-persistence-jpa10</artifactId>
+                <artifactId>geronimo-deploy-config</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-transformer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.objectweb.howl</groupId>
-                <artifactId>howl</artifactId>
-                <version>1.0.1-1</version>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</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>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo 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.configs</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
             <dependency start="true">
-                <groupId>org.apache.xmlbeans</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>2.3.0</version>
+                <groupId>jline</groupId>
+                <artifactId>jline</artifactId>
+                <version>0.9.91</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jee-specs</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>car</type>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.0.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-activation_1.1_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>
+            <config-xml-content load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: GBean Deployer</name>
-        <category>Geronimo Core</category>
-        <description>The GBean Deployer</description>
+        <name>Geronimo Configs :: JSR88 DeploymentFactory</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>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
+                <artifactId>jsr88-deploymentfactory</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>
-            <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-common</artifactId>
                 <version>2.1-SNAPSHOT</version>
@@ -656,20 +767,20 @@
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deployment</artifactId>
+                <artifactId>geronimo-util</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-service-builder</artifactId>
+                <artifactId>geronimo-system</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                <version>1.0</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deploy-jsr88</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
@@ -678,286 +789,236 @@
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
+            <dependency start="true">
+                <groupId>commons-jexl</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>1.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}:${HTTPPortPrimary + PortOffset}</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
+            <config-xml-content load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: J2EE Deployer</name>
-        <category>JavaEE deployment</category>
-        <description>Basic JavaEE deployer functionality including the ear deployer.</description>
+        <name>Geronimo 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.configs</groupId>
-                <artifactId>j2ee-deployer</artifactId>
+                <artifactId>online-deployer</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="false">
+            <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee-schema</artifactId>
+                <artifactId>geronimo-common</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.schema</groupId>
-                <artifactId>geronimo-schema-jee_5</artifactId>
-                <version>1.1</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.schema</groupId>
-                <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-                <version>1.2</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-server</artifactId>
-                <type>car</type>
-            </dependency>
-            <dependency start="false">
+            <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-test-ddbean</artifactId>
+                <artifactId>geronimo-system</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-naming-builder</artifactId>
+                <artifactId>geronimo-util</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-security-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency start="true">
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
-                <type>car</type>
+            <dependency start="true">
+                <groupId>jline</groupId>
+                <artifactId>jline</artifactId>
+                <version>0.9.91</version>
+                <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency start="true">
+                <groupId>commons-jexl</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
-                <type>car</type>
+            <dependency start="true">
+                <groupId>ognl</groupId>
+                <artifactId>ognl</artifactId>
+                <version>2.6.9</version>
+                <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-client</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency start="true">
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-finder</artifactId>
-                <version>3.2</version>
+            <dependency start="true">
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.0.5</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-web-2.5-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-activation_1.1_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>
-            <config-xml-content>
-                <ns2:gbean name="WebBuilder">
-                    <ns2:attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</ns2:attribute>
-                </ns2:gbean>
-                <ns2:gbean name="EnvironmentEntryBuilder">
-                    <ns2:attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
+            <config-xml-content load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Connector Deployer</name>
-        <category>Connector</category>
-        <description>Deployer for J2CA connectors</description>
+        <name>Geronimo 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>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>connector-deployer</artifactId>
+                <artifactId>offline-deployer</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>transaction</artifactId>
-                <type>car</type>
-            </dependency>
-            <dependency start="false">
+            <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-deployer</artifactId>
+                <artifactId>online-deployer</artifactId>
+                <version>2.1-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>
-                <ns2:gbean name="ResourceRefBuilder">
-                    <ns2:attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>
-                    <ns2:attribute name="defaultEnvironment">
-                        <environment:environment xmlns:environment="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                            <environment:dependencies>
-                                <environment:dependency>
-                                    <environment:groupId>org.apache.geronimo.configs</environment:groupId>
-                                    <environment:artifactId>j2ee-corba-yoko</environment:artifactId>
-                                    <environment:type>car</environment:type>
-            </environment:dependency>
-          </environment:dependencies>
-        </environment:environment>
-      </ns2:attribute>
-                </ns2:gbean>
-                <ns2:gbean name="AdminObjectRefBuilder">
-                    <ns2:attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>
-                </ns2:gbean>
-                <ns2:gbean name="ClientResourceRefBuilder">
-                    <ns2:attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>
-                    <ns2:attribute name="defaultEnvironment">
-                        <environment:environment xmlns:environment="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                            <environment:dependencies>
-                                <environment:dependency>
-                                    <environment:groupId>org.apache.geronimo.configs</environment:groupId>
-                                    <environment:artifactId>client-corba-yoko</environment:artifactId>
-                                    <environment:type>car</environment:type>
-            </environment:dependency>
-          </environment:dependencies>
-        </environment:environment>
-      </ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
+            <config-xml-content load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: System Database</name>
-        <category>Geronimo Core</category>
-        <description>System database plugin for geronimo.  This provides system databse together with its dependencies as one dependency.</description>
+        <name>Geronimo 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>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>system-database</artifactId>
+                <artifactId>server-security-config</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <prerequisite>
-                <id>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>transaction</artifactId>
-                </id>
-                <resource-type>Transaction</resource-type>
-                <description>Transaction configuration for Geronimo.</description>
-            </prerequisite>
-            <prerequisite>
-                <id>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>connector-deployer</artifactId>
-                </id>
-                <resource-type>Deployment</resource-type>
-                <description>Connector deployer configuration for Geronimo.</description>
-            </prerequisite>
             <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>transaction</artifactId>
+                <artifactId>j2ee-security</artifactId>
                 <version>2.1-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>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Configs :: Shutdown</name>
+        <category>Geronimo Core</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>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>shutdown</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <jvm-version>1.5</jvm-version>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-derby</artifactId>
+                <artifactId>geronimo-deploy-tool</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-timer</artifactId>
+                <artifactId>geronimo-common</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derby</artifactId>
-                <version>10.2.2.0</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-system</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derbynet</artifactId>
-                <version>10.2.2.0</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-util</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derbyclient</artifactId>
-                <version>10.2.2.0</version>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.0</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.tranql</groupId>
-                <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                <version>1.3</version>
-                <type>rar</type>
+                <groupId>jline</groupId>
+                <artifactId>jline</artifactId>
+                <version>0.9.91</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="DerbyNetwork">
-                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
-                    <ns2:attribute name="port">${DerbyPort + PortOffset}</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
+            <config-xml-content load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Module :: ActiveMQ Broker</name>
-        <category>JMS</category>
-        <description>Apache ActiveMQ integration into geronimo.  This module starts an activemq broker embedded in geronimo.</description>
+        <name>Geronimo 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>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>activemq-broker</artifactId>
+                <artifactId>upgrade-cli</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
@@ -965,68 +1026,69 @@
             <jvm-version>1.5</jvm-version>
             <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>system-database</artifactId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-activemq</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.1_3</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-activemq-management</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.0.4</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-core</artifactId>
-                <version>4.1.1</version>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.14</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>activeio-core</artifactId>
-                <version>3.0.0-incubator</version>
+                <groupId>xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>1.1.3</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>backport-util-concurrent</groupId>
-                <artifactId>backport-util-concurrent</artifactId>
-                <version>2.2</version>
+                <groupId>xpp3</groupId>
+                <artifactId>xpp3</artifactId>
+                <version>1.1.3.3</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-upgrade</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-service-builder</artifactId>
+                <version>2.1-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>
-                <ns2:gbean name="ActiveMQ.tcp.default">
-                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
-                    <ns2:attribute name="port">${ActiveMQPort + PortOffset}</ns2:attribute>
-                </ns2:gbean>
-                <ns2:gbean name="ActiveMQ.stomp.default">
-                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
-                    <ns2:attribute name="port">${ActiveMQStompPort + PortOffset}</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
-            <config-substitution key="ActiveMQPort">61616</config-substitution>
-            <config-substitution key="ActiveMQStompPort">61613</config-substitution>
+            <config-xml-content load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: ActiveMQ Resource Adapter</name>
-        <category>JMS</category>
-        <description>Geronimo ActiveMQ integration: ActiveMQ resource adapter connecting to (embedded) activemq broker.</description>
+        <name>Geronimo Configs :: Spring</name>
+        <category>Geronimo Core</category>
+        <description>Geronimo module that supplies the Spring 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.configs</groupId>
-                <artifactId>activemq-ra</artifactId>
+                <artifactId>spring</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
@@ -1034,59 +1096,91 @@
             <jvm-version>1.5</jvm-version>
             <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>activemq-broker</artifactId>
+                <artifactId>jee-specs</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
+            <dependency start="true">
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>2.0.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>2.0.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>2.0.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>2.0.5</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="ActiveMQ RA">
-                    <ns2:attribute name="ServerUrl">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
-            <config-substitution key="ActiveMQPort">61616</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Server Security Configuration</name>
-        <category>Security</category>
-        <description>Sample security configuration for a demo geronimo server. Not suitable for production use.</description>
+        <name>Geronimo Configs :: Transformer Agent</name>
+        <category>Geronimo Core</category>
+        <description>Geronimo class transformer registry agent.</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.configs</groupId>
-                <artifactId>server-security-config</artifactId>
+                <artifactId>transformer-agent</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
+            <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 Configs :: Plan Upgrade</name>
+        <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.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
+                <artifactId>upgrade</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
-            </dependency>
+            </module-id>
+            <geronimo-version>2.1-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 Configs :: WebServices Common</name>
-        <category>Web Services</category>
-        <description>Common classes for all web services provider integrations.</description>
+        <name>Geronimo Configs :: J2EE Server</name>
+        <category>JavaEE</category>
+        <description>Basic geronimo JavaEE support components including the transaction manager and connector framework.</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.configs</groupId>
-                <artifactId>webservices-common</artifactId>
+                <artifactId>j2ee-server</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
@@ -1094,131 +1188,75 @@
             <jvm-version>1.5</jvm-version>
             <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-server</artifactId>
+                <artifactId>rmi-naming</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-core</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-jaxws</artifactId>
+                <artifactId>geronimo-common</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-webservices</artifactId>
+                <artifactId>geronimo-management</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>wsdl4j</groupId>
-                <artifactId>wsdl4j</artifactId>
-                <version>1.6.1</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>woodstox</groupId>
-                <artifactId>wstx-asl</artifactId>
-                <version>3.2.1</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>com.sun.xml.messaging.saaj</groupId>
-                <artifactId>saaj-impl</artifactId>
-                <version>1.3</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 Configs :: OpenJPA with dependencies</name>
-        <category>Persistence</category>
-        <description>This module provides openjpa together with all its dependencies.</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.configs</groupId>
-                <artifactId>openjpa</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.openjpa</groupId>
-                <artifactId>openjpa</artifactId>
-                <version>1.0.0</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-openjpa</artifactId>
+                <artifactId>geronimo-webservices</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>net.sourceforge.serp</groupId>
-                <artifactId>serp</artifactId>
-                <version>1.11.0</version>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-reflect</artifactId>
+                <version>3.2</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.1</version>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.0</version>
+                <groupId>asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>transaction</artifactId>
-                <version>2.1-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>
+            <artifact-alias key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: OpenEJB</name>
-        <category>EJB Container</category>
-        <description>Geronimo integration of the OpenEJB  ejb container.</description>
+        <name>Geronimo Configs :: Transaction Manager (JTA11)</name>
+        <category>Geronimo Core</category>
+        <description>Geronimo transaction manager module.</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.configs</groupId>
-                <artifactId>openejb</artifactId>
+                <artifactId>transaction</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
@@ -1232,259 +1270,228 @@
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>server-security-config</artifactId>
+                <artifactId>j2ee-security</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>transaction</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-core</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>system-database</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-connector</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>activemq-broker</artifactId>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-connector</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>org.apache.openejb</groupId>
-                <artifactId>openejb-core</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-openejb</artifactId>
+                <artifactId>geronimo-transaction</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>openjpa</artifactId>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-transaction</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.yoko</groupId>
-                <artifactId>yoko-spec-corba</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-persistence-jpa10</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>webservices-common</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-transformer</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
+                <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-finder</artifactId>
-                <version>3.2</version>
+                <groupId>org.objectweb.howl</groupId>
+                <artifactId>howl</artifactId>
+                <version>1.0.1-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="EJBNetworkService">
-                    <ns2:attribute name="port">${OpenEJBPort + PortOffset}</ns2:attribute>
-                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
-            <config-substitution key="OpenEJBPort">4201</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Axis</name>
-        <category>Web Services</category>
-        <description>Apache Axis 1 integration.</description>
+        <name>Geronimo Configs :: J2EE Deployer</name>
+        <category>JavaEE deployment</category>
+        <description>Basic JavaEE deployer functionality including the ear 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.configs</groupId>
-                <artifactId>axis</artifactId>
+                <artifactId>j2ee-deployer</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
             <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>server-security-config</artifactId>
-                <type>car</type>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee-schema</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.schema</groupId>
+                <artifactId>geronimo-schema-jee_5</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.schema</groupId>
+                <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+                <version>1.2</version>
+                <type>jar</type>
             </dependency>
             <dependency start="false">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>webservices-common</artifactId>
+                <artifactId>j2ee-server</artifactId>
                 <type>car</type>
             </dependency>
             <dependency start="false">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-axis</artifactId>
+                <artifactId>geronimo-test-ddbean</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="false">
-                <groupId>axis</groupId>
-                <artifactId>axis</artifactId>
-                <version>1.4</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-naming-builder</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="false">
-                <groupId>org.apache.openejb</groupId>
-                <artifactId>openejb-axis</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-security-builder</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="false">
-                <groupId>commons-discovery</groupId>
-                <artifactId>commons-discovery</artifactId>
-                <version>0.4</version>
-                <type>jar</type>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-security</artifactId>
+                <type>car</type>
             </dependency>
             <dependency start="false">
-                <groupId>org.apache.ws.scout</groupId>
-                <artifactId>scout</artifactId>
-                <version>1.0rc1</version>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee-builder</artifactId>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="false">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>openejb</artifactId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
                 <type>car</type>
             </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-client</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-finder</artifactId>
+                <version>3.2</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-web-2.5-builder</artifactId>
+                <version>2.1-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>
+                <ns2:gbean name="WebBuilder">
+                    <ns2:attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</ns2:attribute>
+                </ns2:gbean>
+                <ns2:gbean name="EnvironmentEntryBuilder">
+                    <ns2:attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>
+                </ns2:gbean>
+            </config-xml-content>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: OpenEJB Deployer</name>
-        <category>EJB Container</category>
-        <description>Geronimo Deployer for OpenEJB Container.</description>
+        <name>Geronimo Configs :: Connector Deployer</name>
+        <category>Connector</category>
+        <description>Deployer for J2CA connectors</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.configs</groupId>
-                <artifactId>openejb-deployer</artifactId>
+                <artifactId>connector-deployer</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
             <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>connector-deployer</artifactId>
-                <type>car</type>
-            </dependency>
-            <dependency start="false">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-webservices-builder</artifactId>
+                <artifactId>geronimo-connector-builder</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-openejb-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>transaction</artifactId>
+                <type>car</type>
             </dependency>
             <dependency start="false">
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>j2ee-deployer</artifactId>
                 <type>car</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>openejb</artifactId>
-                <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>
-                <ns2:gbean name="EjbRefBuilder">
+                <ns2:gbean name="ResourceRefBuilder">
                     <ns2:attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>
+                    <ns2:attribute name="defaultEnvironment">
+                        <environment:environment xmlns:environment="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                            <environment:dependencies>
+                                <environment:dependency>
+                                    <environment:groupId>org.apache.geronimo.configs</environment:groupId>
+                                    <environment:artifactId>j2ee-corba-yoko</environment:artifactId>
+                                    <environment:type>car</environment:type>
+            </environment:dependency>
+          </environment:dependencies>
+        </environment:environment>
+      </ns2:attribute>
                 </ns2:gbean>
-                <ns2:gbean name="ClientEjbRefBuilder">
+                <ns2:gbean name="AdminObjectRefBuilder">
                     <ns2:attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>
-                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
-                    <ns2:attribute name="port">${OpenEJBPort + PortOffset}</ns2:attribute>
                 </ns2:gbean>
-            </config-xml-content>
-            <config-substitution key="OpenEJBPort">4201</config-substitution>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Configs :: Axis Deployer</name>
-        <category>Web Services</category>
-        <description>Web Services Deployer for Geronimo Axis 1 integration</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.configs</groupId>
-                <artifactId>axis-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>openejb-deployer</artifactId>
-                <type>car</type>
-            </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>axis</artifactId>
-                <type>car</type>
-            </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-webservices-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-axis-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-deployer</artifactId>
-                <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>
-                <ns2:gbean name="AxisServiceRefBuilder">
+                <ns2:gbean name="ClientResourceRefBuilder">
                     <ns2:attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>
-                </ns2:gbean>
-                <ns2:gbean name="AxisModuleBuilderExtension">
-                    <ns2:attribute name="listener">?name=${webcontainer}</ns2:attribute>
                     <ns2:attribute name="defaultEnvironment">
                         <environment:environment xmlns:environment="http://geronimo.apache.org/xml/ns/deployment-1.2">
                             <environment:dependencies>
                                 <environment:dependency>
                                     <environment:groupId>org.apache.geronimo.configs</environment:groupId>
-                                    <environment:artifactId>${webcontainerName}</environment:artifactId>
+                                    <environment:artifactId>client-corba-yoko</environment:artifactId>
                                     <environment:type>car</environment:type>
             </environment:dependency>
           </environment:dependencies>
@@ -1495,110 +1502,101 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Client System</name>
+        <name>Geronimo Configs :: System Database</name>
         <category>Geronimo Core</category>
-        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+        <description>System database plugin for geronimo.  This provides system databse together with its dependencies as one dependency.</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.configs</groupId>
-                <artifactId>client-system</artifactId>
+                <artifactId>system-database</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <prerequisite>
+                <id>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>transaction</artifactId>
+                </id>
+                <resource-type>Transaction</resource-type>
+                <description>Transaction configuration for Geronimo.</description>
+            </prerequisite>
+            <prerequisite>
+                <id>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>connector-deployer</artifactId>
+                </id>
+                <resource-type>Deployment</resource-type>
+                <description>Connector deployer configuration for Geronimo.</description>
+            </prerequisite>
             <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-common</artifactId>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>transaction</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
+                <type>car</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-system</artifactId>
+                <artifactId>geronimo-derby</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
+                <artifactId>geronimo-timer</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
-                <version>1.0</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>0.9.91</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>commons-jexl</groupId>
-                <artifactId>commons-jexl</artifactId>
-                <version>1.1</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>ognl</groupId>
-                <artifactId>ognl</artifactId>
-                <version>2.6.9</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>javax.xml.bind</groupId>

[... 6738 lines stripped ...]


Mime
View raw message