geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r630973 [2/2] - /geronimo/site/trunk/docs/plugins/geronimo-2.1/geronimo-plugins.xml
Date Mon, 25 Feb 2008 20:02:45 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=630973&r1=630972&r2=630973&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 Feb 25 12:02:44 2008
@@ -17,19 +17,19 @@
 -->
 <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>
+        <name>Geronimo Framework, Configs :: GBean Deployer Boostrap</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>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</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>
@@ -37,7 +37,7 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: J2EE System</name>
+        <name>Geronimo Framework, Configs :: J2EE System</name>
         <category>Geronimo Core</category>
         <description>Base geronimo server that sets up the kernel.</description>
         <url>http://geronimo.apache.org/</url>
@@ -45,95 +45,126 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>j2ee-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm</artifactId>
                 <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm-commons</artifactId>
                 <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
                 <version>0.9.91</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>commons-jexl</groupId>
                 <artifactId>commons-jexl</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>ognl</groupId>
                 <artifactId>ognl</artifactId>
                 <version>2.6.9</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>2.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>2.0.5</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
                 <version>3.2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.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>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Framework, Configs :: XMLBeans</name>
+        <category>Geronimo Core</category>
+        <description>Geronimo module that supplies the xmlbeans framework in a single classloader.</description>
+        <url>http://geronimo.apache.org/</url>
+        <author>The Apache Geronimo development community</author>
+        <license osi-approved="true">The Apache Software License, Version 2.0</license>
+        <plugin-artifact>
+            <module-id>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.1</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-version>2.1</geronimo-version>
+            <jvm-version>1.5</jvm-version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>j2ee-system</artifactId>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
@@ -142,7 +173,7 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: JavaEE Specs</name>
+        <name>Geronimo Framework, Configs :: JavaEE Specs</name>
         <category>JavaEE</category>
         <description>The JavaEE spec jars in a single classloader.</description>
         <url>http://geronimo.apache.org/</url>
@@ -150,149 +181,126 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>jee-specs</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.configs</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>j2ee-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-el_1.0_spec</artifactId>
-                <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-interceptor_3.0_spec</artifactId>
-                <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <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="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-                <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jacc_1.1_spec</artifactId>
-                <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.3-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-                <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-                <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_3.0_spec</artifactId>
-                <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jta_1.1_spec</artifactId>
-                <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <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="false">
+            <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-jaxws-api</artifactId>
-                <version>1.3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-saaj-api</artifactId>
-                <version>1.3</version>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-saaj_1.3_spec</artifactId>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>jstl</groupId>
                 <artifactId>jstl</artifactId>
-                <version>1.2</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
+            <dependency>
                 <groupId>org.apache.myfaces.core</groupId>
                 <artifactId>myfaces-api</artifactId>
-                <version>1.2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="false">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-jdbc</artifactId>
-                <version>2.1-SNAPSHOT</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
@@ -301,102 +309,239 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: XMLBeans</name>
+        <name>Geronimo Framework, Configs :: RMI Naming</name>
         <category>Geronimo Core</category>
-        <description>Geronimo module that supplies the xmlbeans framework in a single classloader.</description>
+        <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>xmlbeans</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</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>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>j2ee-system</artifactId>
+                <version>2.1</version>
+                <type>car</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>jee-specs</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-management</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-core</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-interceptor</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-naming</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-naming</artifactId>
+                <version>3.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>
+            <config-xml-content>
+                <ns2:gbean name="RMIRegistry">
+                    <ns2:attribute name="port">${NamingPort + PortOffset}</ns2:attribute>
+                </ns2:gbean>
+                <ns2:gbean name="NamingProperties">
+                    <ns2:attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort + PortOffset}</ns2:attribute>
+                </ns2:gbean>
+                <ns2:gbean name="DefaultThreadPool">
+                    <ns2:attribute name="keepAliveTime">30000</ns2:attribute>
+                    <ns2:attribute name="minPoolSize">${MinThreadPoolSize}</ns2:attribute>
+                    <ns2:attribute name="maxPoolSize">${MaxThreadPoolSize}</ns2:attribute>
+                </ns2:gbean>
+            </config-xml-content>
+            <config-substitution key="ServerHostname">localhost</config-substitution>
+            <config-substitution key="PortOffset">0</config-substitution>
+            <config-substitution key="NamingPort">1099</config-substitution>
+            <config-substitution key="MinThreadPoolSize">200</config-substitution>
+            <config-substitution key="MaxThreadPoolSize">500</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: GBean Deployer</name>
+        <name>Geronimo Framework, Configs :: Plugin Management</name>
         <category>Geronimo Core</category>
-        <description>The GBean Deployer</description>
+        <description>Plugin management services including the installer.</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>plugin</artifactId>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</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>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <version>2.1</version>
                 <type>car</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-plugin</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deployment</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deploy-jsr88</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-service-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deploy-config</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <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>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.1</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-archiver</artifactId>
+                <version>1.0-alpha-7</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>1.4.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-container-default</artifactId>
+                <version>1.0-alpha-9</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-component-api</artifactId>
+                <version>1.0-alpha-15</version>
+                <type>jar</type>
+            </dependency>
+            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+            <config-xml-content>
+                <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>
+        </plugin-artifact>
+    </plugin>
+    <plugin>
+        <name>Geronimo Framework, 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.framework</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>2.1</version>
+                <type>car</type>
+            </module-id>
+            <geronimo-version>2.1</geronimo-version>
+            <jvm-version>1.5</jvm-version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.1</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-common</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deployment</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-service-builder</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>plugin</artifactId>
+                <version>2.1</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="Deployer">
-                    <ns2:attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary + PortOffset}</ns2:attribute>
+                    <ns2:attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPort + PortOffset}</ns2:attribute>
                 </ns2:gbean>
             </config-xml-content>
+            <config-xml-content server="offline"/>
+            <config-substitution key="RemoteDeployHostname">localhost</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Client System</name>
+        <name>Geronimo Framework, 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>
@@ -404,229 +549,143 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>client-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
                 <version>0.9.91</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>commons-jexl</groupId>
                 <artifactId>commons-jexl</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>ognl</groupId>
                 <artifactId>ognl</artifactId>
                 <version>2.6.9</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>2.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>2.0.5</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
                 <version>3.2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.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"/>
+            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/2.1/car</artifact-alias>
+            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/2.1/car">org.apache.geronimo.framework/client-system/2.1/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: RMI Naming</name>
-        <category>Geronimo Core</category>
-        <description>Fundamental geronimo services including the plugin installer.</description>
+        <name>Geronimo Framework, Configs :: J2EE Security</name>
+        <category>Security</category>
+        <description>Basic Geronimo server security infrastructure</description>
         <url>http://geronimo.apache.org/</url>
         <author>The Apache Geronimo development community</author>
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>rmi-naming</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>j2ee-security</artifactId>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</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>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <version>2.1</version>
                 <type>car</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-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-util</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-security</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-naming</artifactId>
-                <version>3.2</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-jmx-remoting</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
             <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
             <config-xml-content>
-                <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="JMXService">
+                    <ns2:attribute name="protocol">rmi</ns2:attribute>
+                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
+                    <ns2:attribute name="port">${JMXPort + PortOffset}</ns2:attribute>
+                    <ns2:attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort + PortOffset}/JMXConnector</ns2:attribute>
                 </ns2:gbean>
             </config-xml-content>
-            <config-substitution key="ServerHostname">localhost</config-substitution>
-            <config-substitution key="NamingPort">1099</config-substitution>
-            <config-substitution key="ThreadPoolSize">500</config-substitution>
+            <config-substitution key="JMXPort">9999</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: J2EE Security</name>
-        <category>Security</category>
-        <description>Basic Geronimo server security infrastructure</description>
-        <url>http://geronimo.apache.org/</url>
-        <author>The Apache Geronimo development community</author>
-        <license osi-approved="true">The Apache Software License, Version 2.0</license>
-        <plugin-artifact>
-            <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</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>
-                <version>2.1-SNAPSHOT</version>
-                <type>car</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-jmx-remoting</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="JMXService">
-                    <ns2:attribute name="protocol">rmi</ns2:attribute>
-                    <ns2:attribute name="host">${ServerHostname}</ns2:attribute>
-                    <ns2:attribute name="port">${JMXPort + PortOffset}</ns2:attribute>
-                    <ns2:attribute name="urlPath">/jndi/rmi://${ServerHostname}:${NamingPort + PortOffset}/JMXConnector</ns2:attribute>
-                </ns2:gbean>
-            </config-xml-content>
-            <config-substitution key="JMXPort">9999</config-substitution>
-        </plugin-artifact>
-    </plugin>
-    <plugin>
-        <name>Geronimo Configs :: JSR88 CLI</name>
+        <name>Geronimo Framework, Configs :: JSR-88 CLI</name>
         <category>Deployment</category>
         <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
         <url>http://geronimo.apache.org/</url>
@@ -634,117 +693,117 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>jsr88-cli</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-cli</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-deploy-tool</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-deploy-config</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <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">
+            <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
                 <version>0.9.91</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>2.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>2.0.5</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
                 <version>3.2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.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"/>
+            <config-xml-content server="jsr88"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: JSR88 DeploymentFactory</name>
+        <name>Geronimo Framework, Configs :: JSR-88 DeploymentFactory</name>
         <category>Deployment</category>
         <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
         <url>http://geronimo.apache.org/</url>
@@ -752,57 +811,87 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>jsr88-deploymentfactory</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-deploy-config</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>commons-jexl</groupId>
                 <artifactId>commons-jexl</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.0.5</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-activation_1.1_spec</artifactId>
+                <version>1.0.2</version>
+                <type>jar</type>
+            </dependency>
             <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"/>
+            <config-xml-content server="jsr88"/>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Online Deployer</name>
+        <name>Geronimo Framework, Configs :: Online Deployer</name>
         <category>Deployment</category>
         <description>Geronimo Online Deployer</description>
         <url>http://geronimo.apache.org/</url>
@@ -810,83 +899,125 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>online-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deploy-jsr88</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deploy-tool</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-deploy-config</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <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">
+            <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
                 <version>0.9.91</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>commons-jexl</groupId>
                 <artifactId>commons-jexl</artifactId>
                 <version>1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>ognl</groupId>
                 <artifactId>ognl</artifactId>
                 <version>2.6.9</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-plugin</artifactId>
+                <version>2.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-archiver</artifactId>
+                <version>1.0-alpha-7</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>1.4.1</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>2.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>2.0.5</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
                 <version>3.2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.2</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
@@ -896,7 +1027,7 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Offline Deployer</name>
+        <name>Geronimo Framework, Configs :: Offline Deployer</name>
         <category>Deployment</category>
         <description>Offline deployer</description>
         <url>http://geronimo.apache.org/</url>
@@ -904,17 +1035,17 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>offline-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>online-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
@@ -924,7 +1055,7 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Server Security Configuration</name>
+        <name>Geronimo Framework, Configs :: Server Security Configuration</name>
         <category>Security</category>
         <description>Sample security configuration for a demo geronimo server. Not suitable for production use.</description>
         <url>http://geronimo.apache.org/</url>
@@ -932,26 +1063,27 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>server-security-config</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>j2ee-security</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</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>
+            <copy-file relative-to="server" dest-dir="var">security</copy-file>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Shutdown</name>
+        <name>Geronimo Framework, 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>
@@ -959,44 +1091,44 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>shutdown</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-deploy-tool</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-util</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-crypto</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
                 <version>0.9.91</version>
@@ -1009,7 +1141,7 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: CLI Upgrade</name>
+        <name>Geronimo Framework, Configs :: CLI Upgrade</name>
         <category>Deployment</category>
         <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
         <url>http://geronimo.apache.org/</url>
@@ -1017,59 +1149,59 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>upgrade-cli</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
                 <version>2.1_3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>1.0.4</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.14</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>xstream</groupId>
+            <dependency>
+                <groupId>com.thoughtworks.xstream</groupId>
                 <artifactId>xstream</artifactId>
-                <version>1.1.3</version>
+                <version>1.2.2</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <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>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-upgrade</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-service-builder</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
@@ -1079,49 +1211,31 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Spring</name>
-        <category>Geronimo Core</category>
-        <description>Geronimo module that supplies the Spring framework in a single classloader.</description>
+        <name>Geronimo Framework, Configs :: Plan 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>spring</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>upgrade</artifactId>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jee-specs</artifactId>
-                <version>2.1-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>2.1</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>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-upgrade</artifactId>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
             <source-repository>http://repo1.maven.org/maven2/</source-repository>
@@ -1130,7 +1244,7 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Transformer Agent</name>
+        <name>Geronimo Framework, Configs :: Transformer Agent</name>
         <category>Geronimo Core</category>
         <description>Geronimo class transformer registry agent.</description>
         <url>http://geronimo.apache.org/</url>
@@ -1138,32 +1252,12 @@
         <license osi-approved="true">The Apache Software License, Version 2.0</license>
         <plugin-artifact>
             <module-id>
-                <groupId>org.apache.geronimo.configs</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <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>
-            <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>upgrade</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</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>
@@ -1171,7 +1265,7 @@
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: J2EE Server</name>
+        <name>Geronimo Plugins, 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>
@@ -1181,60 +1275,60 @@
             <module-id>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>j2ee-server</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>rmi-naming</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-core</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-common</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-management</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-j2ee</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-webservices</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-reflect</artifactId>
-                <version>3.2</version>
+                <version>3.3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm</artifactId>
                 <version>2.2.3</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm-commons</artifactId>
                 <version>2.2.3</version>
@@ -1243,11 +1337,11 @@
             <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>
+            <artifact-alias key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/j2ee-server/2.1/car</artifact-alias>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: Transaction Manager (JTA11)</name>
+        <name>Geronimo Plugins, Connector :: Transaction Manager (JTA11)</name>
         <category>Geronimo Core</category>
         <description>Geronimo transaction manager module.</description>
         <url>http://geronimo.apache.org/</url>
@@ -1257,66 +1351,66 @@
             <module-id>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>transaction</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </module-id>
-            <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+            <geronimo-version>2.1</geronimo-version>
             <jvm-version>1.5</jvm-version>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>j2ee-server</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.configs</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>j2ee-security</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>car</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-core</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-connector</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-connector</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-transaction</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-transaction</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-persistence-jpa10</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
-                <groupId>org.apache.geronimo.modules</groupId>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-transformer</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.1</version>
                 <type>jar</type>
             </dependency>
-            <dependency start="true">
+            <dependency>
                 <groupId>org.objectweb.howl</groupId>
                 <artifactId>howl</artifactId>
                 <version>1.0.1-1</version>
@@ -1325,10 +1419,22 @@
             <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="ResourceBindings">
+                    <ns2:attribute name="format">${ResourceBindingsFormat}</ns2:attribute>
+                    <ns2:attribute name="nameInNamespace">${ResourceBindingsNameInNamespace}</ns2:attribute>
+                    <ns2:attribute name="namePattern">${ResourceBindingsNamePattern}</ns2:attribute>
+                    <ns2:attribute name="abstractNameQuery">${ResourceBindingsQuery}</ns2:attribute>
+                </ns2:gbean>
+            </config-xml-content>
+            <config-substitution key="ResourceBindingsFormat">{groupId}/{artifactId}/{j2eeType}/{name}</config-substitution>
+            <config-substitution key="ResourceBindingsNameInNamespace">jca:</config-substitution>
+            <config-substitution key="ResourceBindingsNamePattern"></config-substitution>
+            <config-substitution key="ResourceBindingsQuery">?#org.apache.geronimo.naming.ResourceSource</config-substitution>
         </plugin-artifact>
     </plugin>
     <plugin>
-        <name>Geronimo Configs :: J2EE Deployer</name>
+        <name>Geronimo Plugins, J2EE :: Deployer</name>
         <category>JavaEE deployment</category>
         <description>Basic JavaEE deployer functionality including the ear deployer.</description>
         <url>http://geronimo.apache.org/</url>
@@ -1338,84 +1444,87 @@
             <module-id>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>j2ee-deployer</artifactId>
-                <version>2.1-SNAPSHOT</version>

[... 7212 lines stripped ...]


Mime
View raw message