geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r587226 [2/2] - /geronimo/site/trunk/docs/plugins/geronimo-2.1/geronimo-plugins.xml
Date Mon, 22 Oct 2007 20:05:33 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=587226&r1=587225&r2=587226&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 Mon Oct 22 13:05:32 2007
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
 <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 Configs :: GBean Deployer Boostrap version</name>
@@ -37,6 +21,111 @@
         </plugin-artifact>
     </plugin>
     <plugin>
+        <name>Geronimo 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.configs</groupId>
+                <artifactId>j2ee-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.modules</groupId>
+                <artifactId>geronimo-common</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <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.geronimo.modules</groupId>
+                <artifactId>geronimo-util</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>2.2.3</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>2.2.3</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>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
         <name>Geronimo Configs :: JavaEE Specs</name>
         <category>JavaEE</category>
         <description>The JavaEE spec jars in a single classloader.</description>
@@ -52,151 +141,139 @@
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
+            <dependency start="false">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-system</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-annotation_1.0_spec</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ejb_3.0_spec</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-el_1.0_spec</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-interceptor_3.0_spec</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
                 <version>1.1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jacc_1.1_spec</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.2</version>
+                <version>1.3-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxr_1.0_spec</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jms_1.1_spec</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_3.0_spec</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jsp_2.1_spec</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jta_1.1_spec</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
                 <version>1.1</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>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">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
                 <version>1.1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-jaxws-api</artifactId>
                 <version>1.3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-saaj-api</artifactId>
                 <version>1.3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>jstl</groupId>
                 <artifactId>jstl</artifactId>
                 <version>1.2</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.myfaces.core</groupId>
                 <artifactId>myfaces-api</artifactId>
                 <version>1.2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency start="false">
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-jdbc</artifactId>
                 <version>2.1-SNAPSHOT</version>
@@ -208,164 +285,6 @@
         </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>
-                <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>
-            </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>
-        <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>
-                <version>2.1-SNAPSHOT</version>
-                <type>car</type>
-            </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 :: 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.configs</groupId>
-                <artifactId>j2ee-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.modules</groupId>
-                <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <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.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
-                <version>2.1-SNAPSHOT</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>2.2.3</version>
-                <type>jar</type>
-            </dependency>
-            <dependency start="true">
-                <groupId>asm</groupId>
-                <artifactId>asm-commons</artifactId>
-                <version>2.2.3</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>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
         <name>Geronimo Configs :: RMI Naming</name>
         <category>Geronimo Core</category>
         <description>Fundamental geronimo services including the plugin installer.</description>
@@ -423,9 +342,34 @@
                 <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>
+            </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>
@@ -483,7 +427,7 @@
             <dependency start="true">
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-reflect</artifactId>
-                <version>3.2-SNAPSHOT</version>
+                <version>3.2</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
@@ -501,6 +445,7 @@
             <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>
@@ -594,7 +539,7 @@
             <dependency start="true">
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-connector</artifactId>
-                <version>2.0.1</version>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
@@ -606,7 +551,7 @@
             <dependency start="true">
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-transaction</artifactId>
-                <version>2.0.1</version>
+                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
@@ -633,6 +578,101 @@
         </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>
+                <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>
+            </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>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>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deployment</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>
+            <dependency start="true">
+                <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-deploy-config</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="Deployer">
+                    <ns2:attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary + PortOffset}</ns2:attribute>
+                </ns2:gbean>
+            </config-xml-content>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
         <name>Geronimo Configs :: J2EE Deployer</name>
         <category>JavaEE deployment</category>
         <description>Basic JavaEE deployer functionality including the ear deployer.</description>
@@ -655,6 +695,18 @@
                 <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>
@@ -702,7 +754,7 @@
             <dependency start="false">
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-finder</artifactId>
-                <version>3.0.1</version>
+                <version>3.2</version>
                 <type>jar</type>
             </dependency>
             <dependency start="false">
@@ -796,7 +848,8 @@
     </plugin>
     <plugin>
         <name>Geronimo Configs :: System Database</name>
-        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+        <category>Geronimo Core</category>
+        <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>
@@ -809,9 +862,73 @@
             </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>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-derby</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-timer</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>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbynet</artifactId>
+                <version>10.2.2.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbyclient</artifactId>
+                <version>10.2.2.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>
+            </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>
         </plugin-artifact>
     </plugin>
     <plugin>
@@ -1041,6 +1158,12 @@
                 <type>jar</type>
             </dependency>
             <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-openjpa</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>
@@ -1111,7 +1234,7 @@
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>activemq-ra</artifactId>
+                <artifactId>activemq-broker</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
@@ -1148,7 +1271,7 @@
             <dependency start="true">
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-finder</artifactId>
-                <version>3.0.1</version>
+                <version>3.2</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
@@ -1196,6 +1319,24 @@
                 <type>jar</type>
             </dependency>
             <dependency start="false">
+                <groupId>axis</groupId>
+                <artifactId>axis</artifactId>
+                <version>1.4</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>openejb-axis</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>commons-discovery</groupId>
+                <artifactId>commons-discovery</artifactId>
+                <version>0.4</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
                 <groupId>org.apache.ws.scout</groupId>
                 <artifactId>scout</artifactId>
                 <version>1.0rc1</version>
@@ -1428,10 +1569,12 @@
             <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 :: J2EE Client</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>
@@ -1445,9 +1588,88 @@
             </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>client-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-core</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-interceptor</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>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-management</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-security</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <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.geronimo.modules</groupId>
+                <artifactId>geronimo-client</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-openejb</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>
+                <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 load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
@@ -1495,6 +1717,7 @@
     </plugin>
     <plugin>
         <name>Geronimo Configs :: J2EE Client Security</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>
@@ -1508,13 +1731,21 @@
             </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>client</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 load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
         <name>Geronimo Configs :: Corba J2EE Client</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>
@@ -1524,17 +1755,149 @@
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>client-corba-yoko</artifactId>
                 <version>2.1-SNAPSHOT</version>
-                <type>car</type>
-            </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-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>client</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>client-security</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>openejb-client</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+                <type>jar</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-corba</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-yoko</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.yoko</groupId>
+                <artifactId>yoko-core</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.yoko</groupId>
+                <artifactId>yoko-spec-corba</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.yoko</groupId>
+                <artifactId>yoko-rmi-impl</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.bcel</groupId>
+                <artifactId>bcel</artifactId>
+                <version>5.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 load="false"/>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Configs :: J2EE Client transaction</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>client-transaction</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>client</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>client-security</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-connector</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-connector</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-transaction</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-transaction</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <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.modules</groupId>
+                <artifactId>geronimo-transformer</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 load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: J2EE Client transaction</name>
+        <name>Geronimo Configs :: Application Client Deployments</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>
@@ -1542,32 +1905,39 @@
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>client-transaction</artifactId>
+                <artifactId>client-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>
-            <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 :: Application Client Deployments</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>
+            <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>client-deployer</artifactId>
+                <artifactId>client</artifactId>
+                <type>car</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-client-builder</artifactId>
                 <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>client-transaction</artifactId>
                 <type>car</type>
-            </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
-            <jvm-version>1.5</jvm-version>
+            </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>
@@ -1783,7 +2153,7 @@
             <dependency start="true">
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.2</version>
+                <version>1.3-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <dependency start="true">
@@ -1797,12 +2167,12 @@
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
             <config-xml-content>
                 <ns2:gbean name="SMTPTransport">
-                    <ns2:attribute name="host">${mailHost}</ns2:attribute>
-                    <ns2:attribute name="port">${mailPort}</ns2:attribute>
+                    <ns2:attribute name="host">${SMTPHost}</ns2:attribute>
+                    <ns2:attribute name="port">${SMTPPort + PortOffset}</ns2:attribute>
                 </ns2:gbean>
             </config-xml-content>
-            <config-substitution key="mailHost">localhost</config-substitution>
-            <config-substitution key="mailPort">25</config-substitution>
+            <config-substitution key="SMTPHost">localhost</config-substitution>
+            <config-substitution key="SMTPPort">25</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
@@ -1976,6 +2346,30 @@
                 <type>jar</type>
             </dependency>
             <dependency start="true">
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty</artifactId>
+                <version>6.1.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-ajp</artifactId>
+                <version>6.1.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-sslengine</artifactId>
+                <version>6.1.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>6.1.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>webservices-common</artifactId>
                 <version>2.1-SNAPSHOT</version>
@@ -2030,12 +2424,6 @@
                 <type>car</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.configs</groupId>
                 <artifactId>jetty6</artifactId>
                 <type>car</type>
@@ -2161,6 +2549,12 @@
             </dependency>
             <dependency start="true">
                 <groupId>org.apache.tomcat</groupId>
+                <artifactId>catalina</artifactId>
+                <version>6.0.13-G543818</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.tomcat</groupId>
                 <artifactId>catalina-ha</artifactId>
                 <version>6.0.13</version>
                 <type>jar</type>
@@ -2171,6 +2565,24 @@
                 <version>6.0.13</version>
                 <type>jar</type>
             </dependency>
+            <dependency start="true">
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>coyote</artifactId>
+                <version>6.0.13</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.tomcat.extras</groupId>
+                <artifactId>juli</artifactId>
+                <version>6.0.13</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <groupId>org.apache.tomcat.extras</groupId>
+                <artifactId>juli-adapters</artifactId>
+                <version>6.0.13</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>
@@ -2180,21 +2592,45 @@
                     <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
                     <ns2:attribute name="port">${HTTPPort + PortOffset}</ns2:attribute>
                     <ns2:attribute name="redirectPort">${HTTPSPort + PortOffset}</ns2:attribute>
+                    <ns2:attribute name="maxHttpHeaderSize">8192</ns2:attribute>
+                    <ns2:attribute name="maxThreads">150</ns2:attribute>
+                    <ns2:attribute name="minSpareThreads">25</ns2:attribute>
+                    <ns2:attribute name="maxSpareThreads">75</ns2:attribute>
+                    <ns2:attribute name="enableLookups">false</ns2:attribute>
+                    <ns2:attribute name="acceptCount">100</ns2:attribute>
+                    <ns2:attribute name="connectionTimeout">${WebConnectorConTimeout}</ns2:attribute>
+                    <ns2:attribute name="disableUploadTimeout">true</ns2:attribute>
                 </ns2:gbean>
                 <ns2:gbean name="TomcatAJPConnector">
                     <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
                     <ns2:attribute name="port">${AJPPort + PortOffset}</ns2:attribute>
                     <ns2:attribute name="redirectPort">${HTTPSPort + PortOffset}</ns2:attribute>
+                    <ns2:attribute name="minSpareThreads">25</ns2:attribute>
+                    <ns2:attribute name="maxSpareThreads">75</ns2:attribute>
+                    <ns2:attribute name="enableLookups">false</ns2:attribute>
                 </ns2:gbean>
                 <ns2:gbean name="TomcatWebSSLConnector">
                     <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
                     <ns2:attribute name="port">${HTTPSPort + PortOffset}</ns2:attribute>
+                    <ns2:attribute name="maxHttpHeaderSize">8192</ns2:attribute>
+                    <ns2:attribute name="maxThreads">150</ns2:attribute>
+                    <ns2:attribute name="minSpareThreads">25</ns2:attribute>
+                    <ns2:attribute name="maxSpareThreads">75</ns2:attribute>
+                    <ns2:attribute name="enableLookups">false</ns2:attribute>
+                    <ns2:attribute name="acceptCount">100</ns2:attribute>
+                    <ns2:attribute name="disableUploadTimeout">false</ns2:attribute>
+                    <ns2:attribute name="clientAuth">false</ns2:attribute>
+                    <ns2:attribute name="algorithm">Default</ns2:attribute>
+                    <ns2:attribute name="sslProtocol">TLS</ns2:attribute>
+                    <ns2:attribute name="keystoreFile">var/security/keystores/geronimo-default</ns2:attribute>
+                    <ns2:attribute name="keystorePass">secret</ns2:attribute>
                 </ns2:gbean>
             </config-xml-content>
             <config-substitution key="HTTPPort">8080</config-substitution>
             <config-substitution key="AJPPort">8009</config-substitution>
             <config-substitution key="HTTPSPort">8443</config-substitution>
             <config-substitution key="ServerHostname">0.0.0.0</config-substitution>
+            <config-substitution key="WebConnectorConTimeout">20000</config-substitution>
             <config-substitution key="webcontainer">TomcatWebContainer</config-substitution>
             <config-substitution key="webcontainerName">tomcat6</config-substitution>
         </plugin-artifact>
@@ -2227,12 +2663,6 @@
                 <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.configs</groupId>
                 <artifactId>j2ee-deployer</artifactId>
                 <type>car</type>
@@ -2243,63 +2673,240 @@
                 <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>tomcat6</artifactId>
-                <type>car</type>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>tomcat6</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>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Configs :: JSP Examples Tomcat</name>
+        <category>Example</category>
+        <description>The JSP examples originally developed for Tomcat. Can be found
+        via HTTP at /jsp-examples/ after installation. These examples give
+        a basic introduction to JSP development along with sample code.</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>jsp-examples-tomcat</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>tomcat</artifactId>
+                </id>
+                <resource-type>Web Container</resource-type>
+                <description>The Tomcat web container</description>
+            </prerequisite>
+            <prerequisite>
+                <id>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>jasper</artifactId>
+                </id>
+                <resource-type>Web Container</resource-type>
+                <description>The Jasper subsystem</description>
+            </prerequisite>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper</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 :: 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>jsr88-cli</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>geronimo-gbean-deployer</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>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <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.geronimo.modules</groupId>
+                <artifactId>geronimo-util</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <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-cli</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <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-deploy-config</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>
+                <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>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 :: JSP Examples Tomcat</name>
-        <category>Example</category>
-        <description>The JSP examples originally developed for Tomcat. Can be found
-        via HTTP at /jsp-examples/ after installation. These examples give
-        a basic introduction to JSP development along with sample code.</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>jsp-examples-tomcat</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>
-            <prerequisite>
-                <id>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>tomcat</artifactId>
-                </id>
-                <resource-type>Web Container</resource-type>
-                <description>The Tomcat web container</description>
-            </prerequisite>
-            <prerequisite>
-                <id>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>jasper</artifactId>
-                </id>
-                <resource-type>Web Container</resource-type>
-                <description>The Jasper subsystem</description>
-            </prerequisite>
             <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jasper</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-util</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="true">
+                <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.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-deploy-config</artifactId>
+                <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 load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: JSR88 CLI</name>
+        <name>Geronimo Configs :: JSR88 JAR Configurer</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>
@@ -2307,19 +2914,32 @@
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jsr88-cli</artifactId>
+                <artifactId>jsr88-jar-configurer</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-client-builder</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jsr88-cli</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 load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: JSR88 DeploymentFactory</name>
+        <name>Geronimo Configs :: JSR88 RAR Configurer</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>
@@ -2327,39 +2947,32 @@
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jsr88-deploymentfactory</artifactId>
+                <artifactId>jsr88-rar-configurer</artifactId>
                 <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </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 :: JSR88 JAR Configurer</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>
+            <dependency start="false">
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jsr88-jar-configurer</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>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jsr88-cli</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 load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: JSR88 RAR Configurer</name>
+        <name>Geronimo Configs :: JSR88 WAR Configurer</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>
@@ -2367,19 +2980,32 @@
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jsr88-rar-configurer</artifactId>
+                <artifactId>jsr88-war-configurer</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-web-2.5-builder</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jsr88-cli</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 load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: JSR88 WAR Configurer</name>
+        <name>Geronimo Configs :: JSR88 EAR Configurer</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>
@@ -2387,32 +3013,51 @@
         <plugin-artifact>
             <module-id>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jsr88-war-configurer</artifactId>
+                <artifactId>jsr88-ear-configurer</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-j2ee-builder</artifactId>
+                <version>2.1-SNAPSHOT</version>
+                <type>jar</type>
+            </dependency>
+            <dependency start="false">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jsr88-cli</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 load="false"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: JSR88 EAR Configurer</name>
-        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+        <name>Geronimo Configs :: Management EJB (MEJB)</name>
+        <category>EJB</category>
+        <description>Management EJB for Geronimo</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>jsr88-ear-configurer</artifactId>
+                <artifactId>mejb</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>openejb</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>
@@ -2509,6 +3154,7 @@
             <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>
@@ -2536,6 +3182,7 @@
             <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>
@@ -2634,7 +3281,8 @@
     </plugin>
     <plugin>
         <name>Geronimo Configs :: Servlet Examples for Jetty</name>
-        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+        <category>Example</category>
+        <description>The Servlet examples originally developed for Tomcat. Can be found via HTTP at /servlets-examples/ after installation. These examples give a basic introduction to Servlet development along with sample code.</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>
@@ -2647,6 +3295,23 @@
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>
             <jvm-version>1.5</jvm-version>
+            <prerequisite>
+                <id>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>jetty6</artifactId>
+                </id>
+                <resource-type>Web Container</resource-type>
+                <description>This version of the application works with the Geronimo/Jetty distribution. 
+                                    It is not intended to run in the Geronimo/Tomcat distribution. 
+                                    There is a separate version of the application that works with Tomcat. 
+                                    Please install the version appropriate to your Geronimo distribution.</description>
+            </prerequisite>
+            <dependency start="true">
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper</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>
@@ -2654,7 +3319,8 @@
     </plugin>
     <plugin>
         <name>Geronimo Configs :: Servlet Examples for Tomcat</name>
-        <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+        <category>Example</category>
+        <description>The Servlet examples originally developed for Tomcat. Can be found via HTTP at /servlets-examples/ after installation. These examples give a basic introduction to Servlet development along with sample code.</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>
@@ -2667,6 +3333,23 @@
             </module-id>
             <geronimo-version>2.1-SNAPSHOT</geronimo-version>

[... 2312 lines stripped ...]


Mime
View raw message