geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r614367 [2/8] - in /geronimo/server/trunk: ./ applications/ applications/ca-helper/ca-helper-jetty/ applications/ca-helper/ca-helper-tomcat/ applications/ca-helper/geronimo-ca-helper/ applications/geronimo-uddi-db/ applications/mejb/ applic...
Date Tue, 22 Jan 2008 23:00:03 GMT
Modified: geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,12 +23,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>remote-deploy</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>remote-deploy-jetty</artifactId>
     <name>Geronimo Configs :: Remote Deploy Jetty</name>
     <packaging>car</packaging>
@@ -36,9 +36,8 @@
     <description>Geronimo remote deploy upload servlet (Jetty)</description>
     
     <dependencies>
-    
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>xmlbeans</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -65,6 +64,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -72,7 +72,6 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,12 +23,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>remote-deploy</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>remote-deploy-tomcat</artifactId>
     <name>Geronimo Configs :: Remote Deploy Tomcat</name>
     <packaging>car</packaging>
@@ -36,9 +36,8 @@
     <description>Geronimo remote deploy upload servlet (Tomcat)</description>
 
     <dependencies>
-    
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>xmlbeans</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -65,6 +64,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -72,7 +72,6 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/applications/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/sharedlib/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/sharedlib/pom.xml (original)
+++ geronimo/server/trunk/applications/sharedlib/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,28 +21,30 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>sharedlib</artifactId>
     <name>Geronimo Configs :: Shared Library</name>
-    <packaging>car</packaging>
     <description>Shared Library GBean</description>
-
+    <packaging>car</packaging>
+    
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/applications/uddi-server/geronimo-uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/geronimo-uddi-server/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/geronimo-uddi-server/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/geronimo-uddi-server/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,18 +23,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>uddi-server</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.applications</groupId>
     <artifactId>geronimo-uddi-server</artifactId>
     <name>Geronimo Applications :: UDDI Server</name>
     <packaging>war</packaging>
 
     <dependencies>
-
         <dependency>
             <groupId>juddi</groupId>
             <artifactId>juddi</artifactId>
@@ -46,7 +45,6 @@
             <artifactId>geronimo-jsp_2.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/applications/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,24 +15,31 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
+    
     <artifactId>uddi-server</artifactId>
-    <name>Geronimo Plugins :: uddi-server</name>
+    <name>Geronimo Plugins, UDDI Server</name>
     <packaging>pom</packaging>
+    
     <description>
-        uddi-server plugin
+        UDDI Server plugin
     </description>
+    
     <modules>
         <module>geronimo-uddi-server</module>
         <module>uddi-jetty6</module>
         <module>uddi-tomcat</module>
     </modules>
+
 </project>

Modified: geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,18 +23,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>uddi-server</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>uddi-jetty6</artifactId>
     <name>Geronimo Configs :: UDDI Jetty6</name>
     <packaging>car</packaging>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -54,6 +53,7 @@
             <artifactId>geronimo-uddi-db</artifactId>
             <version>${version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-uddi-server</artifactId>
@@ -95,13 +95,13 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,18 +23,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>uddi-server</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>uddi-tomcat</artifactId>
     <name>Geronimo Configs :: UDDI Tomcat</name>
     <packaging>car</packaging>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -54,6 +53,7 @@
             <artifactId>geronimo-uddi-db</artifactId>
             <version>${version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-uddi-server</artifactId>
@@ -107,7 +107,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,12 +23,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>welcome</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.applications</groupId>
     <artifactId>geronimo-welcome</artifactId>
     <name>Geronimo Applications :: Welcome</name>
     <packaging>war</packaging>
@@ -40,9 +40,8 @@
     </description>
 
     <dependencies>
-
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-plugin</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
@@ -59,7 +58,6 @@
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/pom.xml Tue Jan 22 14:59:41 2008
@@ -30,11 +30,11 @@
     </parent>
 
     <artifactId>welcome</artifactId>
-    <name>Geronimo Plugins :: welcome</name>
+    <name>Geronimo Plugins, Welcome</name>
     <packaging>pom</packaging>
 
     <description>
-        welcome plugin
+        Welcome plugin
     </description>
 
     <modules>

Modified: geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,12 +23,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>welcome</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>welcome-jetty</artifactId>
     <name>Geronimo Configs :: Welcome app Jetty</name>
     <packaging>car</packaging>
@@ -41,7 +41,6 @@
    </description> 
 
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-welcome</artifactId>
@@ -57,6 +56,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -64,19 +64,20 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,12 +23,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>welcome</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>welcome-tomcat</artifactId>
     <name>Geronimo Configs :: Welcome app Tomcat</name>
     <packaging>car</packaging>
@@ -41,7 +41,6 @@
    </description> 
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-welcome</artifactId>
@@ -49,6 +48,7 @@
             <type>war</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
@@ -56,6 +56,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -63,19 +64,20 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Tue Jan 22 14:59:41 2008
@@ -24,19 +24,10 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-<!--
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
--->
-    <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
-<!--<relativePath>../pom.xml</relativePath>-->
     </parent>
 
     <groupId>org.apache.geronimo.assemblies</groupId>
@@ -50,11 +41,9 @@
     </description>
 
     <dependencies>
-
         <!-- lib/gshell Dependencies -->
-
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-commands</artifactId>
             <version>${version}</version>
         </dependency>
@@ -129,9 +118,7 @@
             <artifactId>ant-launcher</artifactId>
         </dependency>
 
-
         <!-- lib Dependencies -->
-
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
@@ -173,82 +160,51 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-cli</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-transformer</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-deploymentfactory</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>client-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>online-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
-        <!--
-        FIXME: Bad idea for plugins
-        -->
-        <!--
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
-        -->
-
         <!-- lib/endorsed Dependencies -->
-
         <dependency>
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-spec-corba</artifactId>
@@ -260,16 +216,15 @@
         </dependency>
 
         <!-- bin Dependencies (executable jars) -->
-
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -281,7 +236,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -301,11 +255,16 @@
 
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-system</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
+                                    <groupId>org.apache.geronimo.framework</groupId>
+                                    <artifactId>geronimo-service-builder</artifactId>
+                                    <version>${version}</version>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-axis-builder</artifactId>
                                     <version>${version}</version>
@@ -337,11 +296,6 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-service-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-web-2.5-builder</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>
@@ -412,7 +366,6 @@
                     <execution>
                         <id>generate-plugin-metadata</id>
                         <phase>generate-resources</phase>
-                        <!--<phase>process-resources</phase>-->
                         <goals>
                             <goal>prepare-metadata</goal>
                         </goals>
@@ -443,7 +396,6 @@
                     <execution>
                         <id>boilerplate</id>
                         <phase>compile</phase>
-                        <!--<phase>package</phase>-->
                         <goals>
                             <goal>directory-inline</goal>
                         </goals>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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
+    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
+       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.
+    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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -33,23 +33,7 @@
             <outputDirectory>lib/gshell</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.apache.geronimo.modules:geronimo-commands</include>
-                <!--<include>org.apache.geronimo.gshell:gshell-embeddable</include>-->
-                <!--<include>org.apache.geronimo.gshell:gshell-cli</include>-->
-
-                <!-- rsh related commands -->
-                <!--<include>org.apache.geronimo.gshell:gshell-whisper</include>-->
-                <!--<include>org.apache.geronimo.gshell.remote:gshell-remote-client</include>-->
-                <!--<include>org.apache.geronimo.gshell.remote:gshell-remote-common</include>-->
-                <!--<include>org.apache.geronimo.gshell.remote:gshell-remote-server</include>-->
-                <!--<include>org.apache.mina:mina-core</include>-->
-                <!--<include>org.apache.mina:mina-filter-ssl</include>-->
-
-                <!--<include>org.codehaus.groovy:groovy-all</include>-->
-                <!--<include>org.apache.ant:ant</include>-->
-                <!--<include>org.apache.ant:ant-launcher</include>-->
-                <!--<include>org.slf4j:slf4j-log4j12</include>-->
-                <!--<include>org.slf4j:jcl104-over-slf4j</include>-->
+                <include>org.apache.geronimo.framework:geronimo-commands</include>
             </includes>
         </dependencySet>
 
@@ -83,16 +67,11 @@
                 <include>log4j:log4j</include>
                 <include>xpp3:xpp3</include>
                 <include>com.thoughtworks.xstream:xstream</include>
-                <!--<include>javax.xml.bind:jaxb-api</include>-->
-                <!--<include>com.sun.xml.bind:jaxb-impl</include>-->
-                <!--<include>woodstox:wstx-asl</include>-->
-                <include>org.apache.geronimo.modules:geronimo-cli</include>
-                <include>org.apache.geronimo.modules:geronimo-kernel</include>
-                <include>org.apache.geronimo.modules:geronimo-deploy-jsr88-bootstrapper</include>
-                <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
-                <include>org.apache.geronimo.modules:geronimo-transformer</include>
-                <!--<include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>-->
-                <!--<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>-->
+                <include>org.apache.geronimo.framework:geronimo-cli</include>
+                <include>org.apache.geronimo.framework:geronimo-kernel</include>
+                <include>org.apache.geronimo.framework:geronimo-deploy-jsr88-bootstrapper</include>
+                <include>org.apache.geronimo.framework:jsr88-deploymentfactory</include>
+                <include>org.apache.geronimo.framework:geronimo-transformer</include>
                 <include>org.codehaus.plexus:plexus-archiver</include>
             </includes>
         </dependencySet>
@@ -102,7 +81,7 @@
             <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
+                <include>org.apache.geronimo.framework:jsr88-deploymentfactory</include>
             </includes>
         </dependencySet>
 
@@ -111,7 +90,7 @@
             <outputFileNameMapping>client.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.apache.geronimo.configs:client-system</include>
+                <include>org.apache.geronimo.framework:client-system</include>
             </includes>
         </dependencySet>
 
@@ -120,7 +99,7 @@
             <outputFileNameMapping>server.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.apache.geronimo.configs:j2ee-system</include>
+                <include>org.apache.geronimo.framework:j2ee-system</include>
             </includes>
         </dependencySet>
 
@@ -129,7 +108,7 @@
             <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.apache.geronimo.configs:shutdown</include>
+                <include>org.apache.geronimo.framework:shutdown</include>
             </includes>
         </dependencySet>
 
@@ -147,7 +126,7 @@
             <outputFileNameMapping>deployer.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.apache.geronimo.configs:online-deployer</include>
+                <include>org.apache.geronimo.framework:online-deployer</include>
             </includes>
         </dependencySet>
         

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf Tue Jan 22 14:59:41 2008
@@ -47,12 +47,12 @@
     load ${gshell.home}/lib/log4j-*.jar
     load ${gshell.home}/lib/cglib-nodep-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
-    load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-cli/2.1-SNAPSHOT/geronimo-cli-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-deploy-config/2.1-SNAPSHOT/geronimo-deploy-config-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-deploy-jsr88/2.1-SNAPSHOT/geronimo-deploy-jsr88-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-deploy-tool/2.1-SNAPSHOT/geronimo-deploy-tool-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-system/2.1-SNAPSHOT/geronimo-system-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-plugin/2.1-SNAPSHOT/geronimo-plugin-*.jar
-    load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-common/2.1-SNAPSHOT/geronimo-common-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1-SNAPSHOT/geronimo-cli-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1-SNAPSHOT/geronimo-deploy-config-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1-SNAPSHOT/geronimo-deploy-jsr88-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1-SNAPSHOT/geronimo-deploy-tool-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1-SNAPSHOT/geronimo-system-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1-SNAPSHOT/geronimo-plugin-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1-SNAPSHOT/geronimo-common-*.jar
     load ${gshell.home}/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-*.jar
     load ${gshell.home}/repository/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-*.jar

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-framework</artifactId>
@@ -46,97 +45,98 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>client-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
         
-<!--
+        <!--
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>upgrade-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
--->
+        -->
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-security</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
         
-<!--
+        <!--
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>online-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
--->
+        -->
 
-<!--
+        <!--
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>offline-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
--->
+        -->
 
-<!--
+        <!--
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
--->
+        -->
 
-<!--
+        <!--
          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-deploymentfactory</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
--->
+        -->
     </dependencies>
     
     <build>
@@ -224,9 +224,7 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
-        
     </build>
     
 </project>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Tue Jan 22 14:59:41 2008
@@ -46,241 +46,264 @@
             <classifier>bin</classifier>
             <scope>provided</scope>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>farming</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transformer-agent</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-system</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>online-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>rmi-naming</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>offline-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jsr88-deploymentfactory</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>shutdown</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jsr88-deploymentfactory</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
+            <artifactId>farming</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
+            <artifactId>transformer-agent</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        <!--
-                <dependency>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>axis2</artifactId>
-                    <version>${version}</version>
-                    <type>car</type>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>axis2-ejb</artifactId>
-                    <version>${version}</version>
-                    <type>car</type>
-                </dependency>
-        -->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>cxf</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>cxf-ejb</artifactId>
+            <artifactId>openejb</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba-yoko</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>axis</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
+        <!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-clustering-wadi</artifactId>
+            <artifactId>axis2</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-clustering-builder-wadi</artifactId>
+            <artifactId>axis2-ejb</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        -->
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
+            <artifactId>cxf</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-broker</artifactId>
+            <artifactId>cxf-ejb</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-ra</artifactId>
+            <artifactId>j2ee-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-system</artifactId>
+            <artifactId>jetty6</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client</artifactId>
+            <artifactId>jetty6-clustering-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-security</artifactId>
+            <artifactId>jetty6-clustering-builder-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-corba-yoko</artifactId>
+            <artifactId>system-database</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>javamail</artifactId>
+            <artifactId>activemq-broker</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
+            <artifactId>activemq-ra</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
+            <artifactId>client</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>myfaces</artifactId>
+            <artifactId>client-security</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>myfaces-deployer</artifactId>
+            <artifactId>client-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>online-deployer</artifactId>
+            <artifactId>javamail</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>offline-deployer</artifactId>
+            <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-cli</artifactId>
+            <artifactId>jasper-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-deploymentfactory</artifactId>
+            <artifactId>myfaces</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>myfaces-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -438,16 +461,9 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>shutdown</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>upgrade-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -462,20 +478,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-deploymentfactory</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-jar-configurer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -544,7 +546,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-jetty6-minimal</artifactId>
@@ -48,134 +47,134 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>client-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>upgrade-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>j2ee-security</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>online-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>offline-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jsr88-deploymentfactory</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>remote-deploy-jetty</artifactId>
+            <artifactId>jetty6</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>shutdown</artifactId>
+            <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>sharedlib</artifactId>
+            <artifactId>jasper-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>online-deployer</artifactId>
+            <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>offline-deployer</artifactId>
+            <artifactId>jetty6-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-cli</artifactId>
+            <artifactId>remote-deploy-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-deploymentfactory</artifactId>
+            <artifactId>sharedlib</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -347,7 +346,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Tue Jan 22 14:59:41 2008
@@ -62,14 +62,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -83,7 +83,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-security</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -123,21 +123,23 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <!--
-                <dependency>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>cxf</artifactId>
-                    <version>${version}</version>
-                    <type>car</type>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>cxf-ejb</artifactId>
-                    <version>${version}</version>
-                    <type>car</type>
-                </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-ejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
         -->
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba-yoko</artifactId>
@@ -188,7 +190,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>client-system</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -251,35 +253,35 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>online-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>offline-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-deploymentfactory</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -440,14 +442,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>upgrade-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -461,14 +463,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-deploymentfactory</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Tue Jan 22 14:59:41 2008
@@ -48,28 +48,28 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>client-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>upgrade-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -83,7 +83,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-security</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -111,7 +111,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -139,7 +139,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>shutdown</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -153,28 +153,28 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>online-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>offline-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-deploymentfactory</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.assemblies</groupId>
@@ -44,8 +43,10 @@
         <module>geronimo-framework</module>
         <module>geronimo-jetty6-minimal</module>
         <module>geronimo-jetty6-javaee5</module>
+        <!--
         <module>geronimo-tomcat6-minimal</module>
         <module>geronimo-tomcat6-javaee5</module>
+        -->
     </modules>
 
     <build>

Modified: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml Tue Jan 22 14:59:41 2008
@@ -29,7 +29,7 @@
     </parent>
     
     <artifactId>buildsupport-maven-plugin</artifactId>
-    <name>Geronimo Build Support, Buildsupport Maven Plugin</name>
+    <name>Geronimo Build Support :: Plugin</name>
     <packaging>maven-plugin</packaging>
     
     <description>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml Tue Jan 22 14:59:41 2008
@@ -29,7 +29,7 @@
     </parent>
     
     <artifactId>car-maven-plugin</artifactId>
-    <name>Geronimo Build Support, CAR</name>
+    <name>Geronimo Build Support :: CAR</name>
     <packaging>maven-plugin</packaging>
 
     <description>
@@ -58,35 +58,36 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-plugin</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-tool</artifactId>
             <version>${version}</version>
             
             <!-- exclude transitive deps -->
             <exclusions>
                 <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
+                    <groupId>org.apache.geronimo.framework</groupId>
                     <artifactId>geronimo-util</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
+                    <groupId>org.apache.geronimo.framework</groupId>
                     <artifactId>geronimo-deploy-jsr88</artifactId>
                 </exclusion>
             </exclusions>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml Tue Jan 22 14:59:41 2008
@@ -34,9 +34,8 @@
     <packaging>car</packaging>
 
     <dependencies>
-
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -44,19 +43,19 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-util</artifactId>
             <version>${version}</version>
         </dependency>
@@ -97,24 +96,26 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </dependency>
-
-
     </dependencies>
 
     <build>
@@ -138,12 +139,12 @@
                     -->
                     <classpath>
                         <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-cli</artifactId>
                             <version>${version}</version>
                         </element>
                         <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
                             <version>${version}</version>
                         </element>
@@ -151,7 +152,7 @@
                         NOTE: geronimo-transformer needs to be on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
                         -->
                         <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-transformer</artifactId>
                             <version>${version}</version>
                         </element>



Mime
View raw message