geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r390546 [1/2] - in /geronimo/trunk: ./ applications/ assemblies/ configs/ modules/ modules/activation/ modules/activemq-embedded-rar/ modules/axis-builder/ modules/axis/ modules/client-builder/ modules/client/ modules/common/ modules/connec...
Date Sat, 01 Apr 2006 00:03:27 GMT
Author: jlaskowski
Date: Fri Mar 31 16:03:23 2006
New Revision: 390546

URL: http://svn.apache.org/viewcvs?rev=390546&view=rev
Log:
GERONIMO-1755 - Restructure top-level pom
Submitted by: Prasad Kashyap

Added:
    geronimo/trunk/applications/pom.xml   (with props)
    geronimo/trunk/assemblies/pom.xml   (with props)
    geronimo/trunk/configs/pom.xml   (with props)
    geronimo/trunk/modules/pom.xml   (with props)
    geronimo/trunk/plugins/pom.xml   (with props)
Modified:
    geronimo/trunk/modules/activation/pom.xml
    geronimo/trunk/modules/activemq-embedded-rar/pom.xml
    geronimo/trunk/modules/axis-builder/pom.xml
    geronimo/trunk/modules/axis/pom.xml
    geronimo/trunk/modules/client-builder/pom.xml
    geronimo/trunk/modules/client/pom.xml
    geronimo/trunk/modules/common/pom.xml
    geronimo/trunk/modules/connector-builder/pom.xml
    geronimo/trunk/modules/connector/pom.xml
    geronimo/trunk/modules/converter/pom.xml
    geronimo/trunk/modules/core/pom.xml
    geronimo/trunk/modules/deploy-config/pom.xml
    geronimo/trunk/modules/deploy-jsr88/pom.xml
    geronimo/trunk/modules/deploy-tool/pom.xml
    geronimo/trunk/modules/deployment/pom.xml
    geronimo/trunk/modules/derby/pom.xml
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/hot-deploy/pom.xml
    geronimo/trunk/modules/installer-processing/pom.xml
    geronimo/trunk/modules/installer-support/pom.xml
    geronimo/trunk/modules/interceptor/pom.xml
    geronimo/trunk/modules/j2ee-builder/pom.xml
    geronimo/trunk/modules/j2ee-schema/pom.xml
    geronimo/trunk/modules/j2ee/pom.xml
    geronimo/trunk/modules/javamail-transport/pom.xml
    geronimo/trunk/modules/jetty-builder/pom.xml
    geronimo/trunk/modules/jetty/pom.xml
    geronimo/trunk/modules/jmx-remoting/pom.xml
    geronimo/trunk/modules/kernel/pom.xml
    geronimo/trunk/modules/mail/pom.xml
    geronimo/trunk/modules/management/pom.xml
    geronimo/trunk/modules/naming-builder/pom.xml
    geronimo/trunk/modules/naming/pom.xml
    geronimo/trunk/modules/scripts/pom.xml
    geronimo/trunk/modules/security-builder/pom.xml
    geronimo/trunk/modules/security/pom.xml
    geronimo/trunk/modules/service-builder/pom.xml
    geronimo/trunk/modules/session/pom.xml
    geronimo/trunk/modules/spring/pom.xml
    geronimo/trunk/modules/system/pom.xml
    geronimo/trunk/modules/test-ddbean/pom.xml
    geronimo/trunk/modules/timer/pom.xml
    geronimo/trunk/modules/tomcat-builder/pom.xml
    geronimo/trunk/modules/tomcat/pom.xml
    geronimo/trunk/modules/transaction/pom.xml
    geronimo/trunk/modules/util/pom.xml
    geronimo/trunk/modules/web-builder/pom.xml
    geronimo/trunk/modules/webservices/pom.xml
    geronimo/trunk/pom.xml

Added: geronimo/trunk/applications/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/pom.xml?rev=390546&view=auto
==============================================================================
--- geronimo/trunk/applications/pom.xml (added)
+++ geronimo/trunk/applications/pom.xml Fri Mar 31 16:03:23 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.applications</groupId>
+  <artifactId>applications-parent</artifactId>
+  <version>${geronimoVersion}</version>
+  <packaging>pom</packaging>
+  <name>Geronimo Applications</name>
+  <description>Geronimo Applications</description>
+
+</project>

Propchange: geronimo/trunk/applications/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/trunk/applications/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/pom.xml?rev=390546&view=auto
==============================================================================
--- geronimo/trunk/assemblies/pom.xml (added)
+++ geronimo/trunk/assemblies/pom.xml Fri Mar 31 16:03:23 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.assemblies</groupId>
+  <artifactId>assemblies-parent</artifactId>
+  <version>${geronimoVersion}</version>
+  <packaging>pom</packaging>
+  <name>Geronimo Assemblies</name>
+  <description>Geronimo Assemblies</description>
+
+
+</project>

Propchange: geronimo/trunk/assemblies/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/assemblies/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/trunk/assemblies/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/pom.xml?rev=390546&view=auto
==============================================================================
--- geronimo/trunk/configs/pom.xml (added)
+++ geronimo/trunk/configs/pom.xml Fri Mar 31 16:03:23 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.configs</groupId>
+  <artifactId>configs-parent</artifactId>
+  <version>${geronimoVersion}</version>
+  <packaging>pom</packaging>
+  <name>Geronimo Configs</name>
+  <description>Geronimo Configs</description>
+
+</project>

Propchange: geronimo/trunk/configs/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/trunk/configs/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/activation/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/activation/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/activation/pom.xml (original)
+++ geronimo/trunk/modules/activation/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,10 +20,11 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-activation</artifactId>
   <name>Geronimo :: Activation</name>
@@ -32,6 +33,7 @@
     Geronimo Activation implements Content Handlers for use in conjuction with
     the Java Activation Framework.
   </description>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/activemq-embedded-rar/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-activemq-embedded-rar</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>rar</packaging>

Modified: geronimo/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/trunk/modules/axis-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-axis-builder</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Axis :: Builder</name>
@@ -113,32 +112,32 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-axis</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-schema</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming-builder</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/axis/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/pom.xml (original)
+++ geronimo/trunk/modules/axis/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-axis</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -47,17 +46,17 @@
 -->
         
         <dependency>
-            <groupId>org.apache.geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
         </dependency>
 

Modified: geronimo/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/trunk/modules/client-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -71,12 +71,12 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-client</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector-builder</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/client/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/client/pom.xml (original)
+++ geronimo/trunk/modules/client/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-client</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -38,37 +37,37 @@
   <dependencies>
     <!--for GeronimoSecurityException-->
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/common/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/common/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/common/pom.xml (original)
+++ geronimo/trunk/modules/common/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,18 +21,17 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-common</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Common</name>
   <description>Geronimo Common</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/trunk/modules/connector-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-connector-builder</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Connector :: Builder</name>
@@ -107,19 +106,19 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deploy-config</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-test-ddbean</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/connector/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/pom.xml (original)
+++ geronimo/trunk/modules/connector/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,47 +21,46 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-connector</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Connector</name>
   <description>Geronimo Connector</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming</artifactId>
     </dependency>
     <!-- Needed only for DeploymentException in a test, from NameFactory which probably shouldn't be throwing it in the first place-->
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
     </dependency>
     <!--  test only -->

Modified: geronimo/trunk/modules/converter/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/converter/pom.xml (original)
+++ geronimo/trunk/modules/converter/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -30,12 +30,12 @@
   <version>${geronimoVersion}</version>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/core/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/core/pom.xml (original)
+++ geronimo/trunk/modules/core/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-core</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -49,7 +48,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
   </dependencies>

Modified: geronimo/trunk/modules/deploy-config/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-config/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-config/pom.xml (original)
+++ geronimo/trunk/modules/deploy-config/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-deploy-config</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>

Modified: geronimo/trunk/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/pom.xml (original)
+++ geronimo/trunk/modules/deploy-jsr88/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+   <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-deploy-jsr88</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -58,53 +57,53 @@
     <!-- Module Dependencies -->
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deployment</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-util</artifactId>
     </dependency>
 
     <!-- only until we move out various DConfigBean trees -->
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deploy-config</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-service-builder</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector-builder</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-web-builder</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/pom.xml (original)
+++ geronimo/trunk/modules/deploy-tool/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-deploy-tool</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Deploy :: CLI Tool</name>
@@ -49,27 +48,27 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-util</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deployment</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deploy-jsr88</artifactId>
     </dependency>
   </dependencies>

Modified: geronimo/trunk/modules/deployment/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/pom.xml (original)
+++ geronimo/trunk/modules/deployment/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-deployment</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -48,17 +47,17 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/derby/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/derby/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/derby/pom.xml (original)
+++ geronimo/trunk/modules/derby/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,26 +21,25 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-derby</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Derby</name>
   <description>Wrapper for using Apache Derby as a bundled database.</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-management</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-directory</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Directory</name>
@@ -75,15 +74,15 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
     <!-- Third Party Jars -->
@@ -207,25 +206,25 @@
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4jVersion}</version>
     </dependency>
-    <dependency>
-      <groupId>xmlbeans</groupId>
-      <artifactId>xbean</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax</artifactId>
-      <version>1.1.1-dev</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>xmlbeans</groupId>
-          <artifactId>xmlbeans-jsr173-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
+    <dependency>
+      <groupId>xmlbeans</groupId>
+      <artifactId>xbean</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax</artifactId>
+      <version>1.1.1-dev</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xmlbeans-jsr173-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
 </project>

Modified: geronimo/trunk/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/hot-deploy/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/hot-deploy/pom.xml (original)
+++ geronimo/trunk/modules/hot-deploy/pom.xml Fri Mar 31 16:03:23 2006
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  
-  Copyright 2006 The Apache Software Foundation
-  
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-hot-deploy</artifactId>
   <name>Geronimo :: Deploy :: Hot Deployer</name>
-  <version>${geronimoVersion}</version>
+  <version>${geronimoVersion}</version>
   <description>A GBean that implements a Hot Deploy directory</description>
   <dependencies>
     <dependency>
@@ -36,31 +36,31 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deploy-tool</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deploy-jsr88</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>

Modified: geronimo/trunk/modules/installer-processing/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/installer-processing/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-processing/pom.xml (original)
+++ geronimo/trunk/modules/installer-processing/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: geronimo/trunk/modules/installer-support/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/installer-support/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-support/pom.xml (original)
+++ geronimo/trunk/modules/installer-support/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: geronimo/trunk/modules/interceptor/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interceptor/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/interceptor/pom.xml (original)
+++ geronimo/trunk/modules/interceptor/pom.xml Fri Mar 31 16:03:23 2006
@@ -18,11 +18,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-interceptor</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>

Modified: geronimo/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -97,7 +97,7 @@
       </exclusions>
     </dependency> 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security-builder</artifactId>
     </dependency>
   </dependencies>

Modified: geronimo/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: geronimo/trunk/modules/j2ee/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/pom.xml (original)
+++ geronimo/trunk/modules/j2ee/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -49,17 +49,17 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-core</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-management</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/javamail-transport/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/javamail-transport/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/javamail-transport/pom.xml (original)
+++ geronimo/trunk/modules/javamail-transport/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-javamail-transport</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: JavaMail Transport</name>

Modified: geronimo/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/trunk/modules/jetty-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,15 +20,16 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-jetty-builder</artifactId>
   <name>Geronimo :: Jetty :: Builder</name>
   <version>${geronimoVersion}</version>
-  <description>Geronimo Jetty Deployer</description>
+  
+
   <build>
     <plugins>
       <plugin>
@@ -74,14 +75,13 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-web-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-jetty</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
   </dependencies>
 </project>
-

Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -48,15 +48,15 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-webservices</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/jmx-remoting/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jmx-remoting/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/jmx-remoting/pom.xml (original)
+++ geronimo/trunk/modules/jmx-remoting/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,18 +21,17 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-jmxremoting</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: JMX Remoting</name>
   <description>Provides remote access to a Geronimo server using JSR 160 JMX Remoting</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/kernel/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/pom.xml (original)
+++ geronimo/trunk/modules/kernel/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-kernel</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Kernel</name>

Modified: geronimo/trunk/modules/mail/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/pom.xml (original)
+++ geronimo/trunk/modules/mail/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-mail</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Mail</name>  
@@ -46,15 +45,15 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-management</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/management/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/management/pom.xml (original)
+++ geronimo/trunk/modules/management/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-management</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Management API</name>

Modified: geronimo/trunk/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/pom.xml (original)
+++ geronimo/trunk/modules/naming-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -78,40 +78,40 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deploy-config</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-schema</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/trunk/modules/naming/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/naming/pom.xml (original)
+++ geronimo/trunk/modules/naming/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-naming</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -34,11 +33,11 @@
   <dependencies>
     <!-- only for ComponentContextInterceptor -->
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-interceptor</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>

Added: geronimo/trunk/modules/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/pom.xml?rev=390546&view=auto
==============================================================================
--- geronimo/trunk/modules/pom.xml (added)
+++ geronimo/trunk/modules/pom.xml Fri Mar 31 16:03:23 2006
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.modules</groupId>
+  <artifactId>modules-parent</artifactId>
+  <version>1.2-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Geronimo Modules</name>
+  <description>Geronimo Modules</description>
+
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>activation</module>
+        <module>activemq-embedded-rar</module>
+        <module>axis</module>
+        <module>axis-builder</module>
+        <module>client</module>
+        <module>client-builder</module>
+        <module>common</module>
+        <module>connector</module>
+        <module>connector-builder</module>
+        <module>converter</module>
+        <module>core</module>
+        <module>deploy-config</module>
+        <module>deploy-jsr88</module>
+        <module>deploy-tool</module>
+        <module>deployment</module>
+        <module>derby</module>
+        <module>directory</module>
+        <module>hot-deploy</module>
+        <module>installer-processing</module>
+        <module>installer-support</module>
+        <module>interceptor</module>
+        <module>j2ee</module>
+        <module>j2ee-builder</module>
+        <module>j2ee-schema</module>
+        <module>jetty</module>
+        <module>jetty-builder</module>
+        <module>javamail-transport</module>
+        <module>jmx-remoting</module>
+        <module>kernel</module>
+        <module>management</module>
+        <module>mail</module>
+        <module>naming</module>
+        <module>naming-builder</module>
+        <module>scripts</module>
+        <module>security</module>
+        <module>security-builder</module>
+        <module>service-builder</module>
+        <module>session</module>
+        <module>spring</module>
+        <module>system</module>
+        <module>test-ddbean</module>
+        <module>timer</module>
+        <module>tomcat</module>
+        <module>tomcat-builder</module>
+        <module>transaction</module>
+        <module>util</module>
+        <module>web-builder</module>
+        <module>webservices</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>singlemodule</id>
+      <activation>
+        <property>
+          <name>module</name>
+        </property>
+      </activation>
+      <modules>
+        <module>${module}</module>
+      </modules>
+    </profile>
+  </profiles>
+
+</project>

Propchange: geronimo/trunk/modules/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/trunk/modules/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/scripts/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/scripts/pom.xml (original)
+++ geronimo/trunk/modules/scripts/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-scripts</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Scripts</name>

Modified: geronimo/trunk/modules/security-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/pom.xml (original)
+++ geronimo/trunk/modules/security-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-security-builder</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -75,43 +74,43 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deployment</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deploy-config</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-service-builder</artifactId>
     </dependency>
 
     <!--needed only because security schema references j2ee 1.4 schema for description element -->
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-schema</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/security/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/security/pom.xml (original)
+++ geronimo/trunk/modules/security/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-security</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Security</name>
@@ -53,27 +52,27 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-interceptor</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/service-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/pom.xml (original)
+++ geronimo/trunk/modules/service-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-service-builder</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Service :: Builder</name>
@@ -74,38 +73,38 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deployment</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+      <groupId>org.apache.geronimo.modules</groupId>
+      <artifactId>geronimo-j2ee</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-j2ee</artifactId>
+      <groupId>org.apache.geronimo.modules</groupId>
+      <artifactId>geronimo-j2ee-schema</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-j2ee-schema</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
     </dependency>
 
     <dependency>

Modified: geronimo/trunk/modules/session/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/session/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/session/pom.xml (original)
+++ geronimo/trunk/modules/session/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-session</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Session</name>

Modified: geronimo/trunk/modules/spring/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/spring/pom.xml (original)
+++ geronimo/trunk/modules/spring/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,22 +21,21 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-spring</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Spring</name>
   <description>Spring Framework wrappers for Geronimo components</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/system/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/system/pom.xml (original)
+++ geronimo/trunk/modules/system/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-system</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -76,17 +75,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-util</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
 

Modified: geronimo/trunk/modules/test-ddbean/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/test-ddbean/pom.xml (original)
+++ geronimo/trunk/modules/test-ddbean/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-test-ddbean</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Test :: DDBeans</name>
@@ -56,11 +55,11 @@
       <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-schema</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-service-builder</artifactId>
     </dependency>
   </dependencies>

Modified: geronimo/trunk/modules/timer/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/pom.xml (original)
+++ geronimo/trunk/modules/timer/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,34 +21,33 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-timer</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Timer</name>
   <description>Geronimo Timer</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/pom.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-tomcat-builder</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Tomcat :: Builder</name>
@@ -136,77 +135,77 @@
       <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-webservices</artifactId>
     </dependency>
     <!-- These require dependencies.dependency.version -->
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-schema</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-tomcat</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-service-builder</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-builder</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security-builder</artifactId>
       <version>${geronimoVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-web-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-axis</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-axis-builder</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/trunk/modules/tomcat/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-tomcat</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Tomcat</name>
@@ -112,41 +111,41 @@
       <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-webservices</artifactId>
       <!-- ws uses dependencies.dependency.version -->
       <version>${geronimoVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security-builder</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/transaction/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/pom.xml (original)
+++ geronimo/trunk/modules/transaction/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-transaction</artifactId>
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
@@ -34,20 +33,20 @@
   <dependencies>
     <!-- temp, for ServerInfo. Remove when it is moved to Kernel-->
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-system</artifactId>
     </dependency>
     <!-- thread pool, for timer -->
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-kernel</artifactId>
     </dependency>
     <dependency>

Modified: geronimo/trunk/modules/util/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/util/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/util/pom.xml (original)
+++ geronimo/trunk/modules/util/pom.xml Fri Mar 31 16:03:23 2006
@@ -21,11 +21,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-util</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Util</name>

Modified: geronimo/trunk/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/pom.xml?rev=390546&r1=390545&r2=390546&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/pom.xml (original)
+++ geronimo/trunk/modules/web-builder/pom.xml Fri Mar 31 16:03:23 2006
@@ -20,8 +20,8 @@
 
 <project>
   <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>modules-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -74,48 +74,48 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deploy-config</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-service-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming-builder</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee-schema</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-test-ddbean</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-j2ee</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>



Mime
View raw message