You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/01/23 00:00:03 UTC

svn commit: r614367 [5/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...

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,22 +23,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis2</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>axis2-deployer</artifactId>
-    <name>Geronimo Configs :: Axis2 Deployer</name>
+    <name>Geronimo Plugins, AXIS2 :: Deployer</name>
     <packaging>car</packaging>
 
     <description>Geronimo web services deployer for Axis 2</description>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-             <artifactId>jaxws-deployer</artifactId>
+            <artifactId>jaxws-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -55,9 +55,9 @@
             <type>car</type>
             <version>${version}</version>
             <scope>runtime</scope>
-       </dependency>
+        </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -69,23 +69,23 @@
                     </useMavenDependencies>
                     <category>Web Services</category>
                     <dependencies>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>jaxws-deployer</artifactId>
-                        <type>car</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>axis2</artifactId>
-                        <type>car</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-axis2-builder</artifactId>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>jaxws-deployer</artifactId>
+                            <type>car</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>axis2</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-axis2-builder</artifactId>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,21 +16,21 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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>axis2</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>axis2-ejb-deployer</artifactId>
-    <name>Geronimo Configs :: Axis2 EJB Deployer</name>
+    <name>Geronimo Plugins, AXIS2 :: EJB Deployer</name>
     <packaging>car</packaging>
 
     <description>Geronimo JAX-WS EJB deployer for Apache Axis2</description>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,21 +16,21 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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>axis2</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>axis2-ejb</artifactId>
-    <name>Geronimo Configs :: Axis2 EJB</name>
+    <name>Geronimo Plugins, AXIS2 :: EJB</name>
     <packaging>car</packaging>
 
     <description>
@@ -38,7 +38,6 @@
    </description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2</artifactId>
@@ -58,7 +57,6 @@
             <artifactId>geronimo-axis2-ejb</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -76,4 +74,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis2</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>axis2</artifactId>
-    <name>Geronimo Configs :: Axis2</name>
+    <name>Geronimo Plugins, AXIS2 :: AXIS2</name>
     <packaging>car</packaging>
 
     <description>
@@ -38,7 +38,6 @@
     </description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
@@ -47,7 +46,7 @@
         </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>
@@ -82,98 +81,121 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-java2wsdl</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-adb</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-jaxws</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-jaxws-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-metadata</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-saaj</artifactId>
         </dependency>
+
         <dependency>
-             <groupId>org.apache.httpcomponents</groupId>
-             <artifactId>httpcore</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-dom</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-impl</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
         </dependency>
+
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
+
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
         </dependency>
+
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
         </dependency>
+
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
         </dependency>
+
         <dependency>
             <groupId>annogen</groupId>
             <artifactId>annogen</artifactId>
         </dependency>
+
         <dependency>
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
         </dependency>
-       <dependency>
-           <groupId>com.sun.xml.ws</groupId>
-           <artifactId>jaxws-tools</artifactId>
-       </dependency>
-       <dependency>
-           <groupId>com.sun.xml.ws</groupId>
-           <artifactId>jaxws-rt</artifactId>
-       </dependency>
-       <dependency>
-           <groupId>com.sun.xml.bind</groupId>
-           <artifactId>jaxb-xjc</artifactId>
-       </dependency>
-       <dependency>
-           <groupId>backport-util-concurrent</groupId>
-           <artifactId>backport-util-concurrent</artifactId>
-       </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-tools</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -191,4 +213,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,21 +16,21 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis2</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-axis2-builder</artifactId>
-    <name>Geronimo Modules :: Axis2 :: Builder</name>
+    <name>Geronimo Plugins, AXIS2 :: Builder</name>
 
     <dependencies>
         <dependency>
@@ -79,7 +79,6 @@
             <artifactId>jaxb-xjc</artifactId>
         </dependency>
         <!--end add for wsgen-->
-
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,24 +16,23 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis2</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-axis2-ejb-builder</artifactId>
-    <name>Geronimo Modules :: Axis2 :: EJB Builder</name>
+    <name>Geronimo Plugins, AXIS2 :: EJB Builder</name>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis2-builder</artifactId>
@@ -45,7 +44,6 @@
             <artifactId>geronimo-jaxws-ejb-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,24 +16,23 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis2</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-axis2-ejb</artifactId>
-    <name>Geronimo Modules :: AXIS2 EJB</name>
+    <name>Geronimo Plugins, AXIS2 :: EJB Core</name>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis2</artifactId>
@@ -45,7 +44,6 @@
             <artifactId>geronimo-openejb</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,21 +16,21 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis2</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-axis2</artifactId>
-    <name>Geronimo Modules :: AXIS2</name>
+    <name>Geronimo Plugins, AXIS2 :: Core</name>
     
     <dependencies>
         <dependency>
@@ -65,43 +65,53 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-java2wsdl</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-adb</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-jaxws-api</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-metadata</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
             <scope>test</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-impl</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -120,30 +130,37 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>annogen</groupId>
             <artifactId>annogen</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

Modified: geronimo/server/trunk/plugins/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,21 +15,27 @@
     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>axis2</artifactId>
-    <name>Geronimo Plugins :: axis2</name>
+    <name>Geronimo Plugins, AXIS2</name>
     <packaging>pom</packaging>
+    
     <description>
-        axis2 plugin
+        AXIS2 plugin
     </description>
+    
     <modules>
         <module>axis2</module>
         <module>axis2-deployer</module>
@@ -40,4 +46,5 @@
         <module>geronimo-axis2-ejb</module>
         <module>geronimo-axis2-ejb-builder</module>
     </modules>
+
 </project>

Modified: geronimo/server/trunk/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/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>client</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>client-deployer</artifactId>
-    <name>Geronimo Configs :: Application Client Deployments</name>
+    <name>Geronimo Plugins, Client :: Deployer</name>
     <packaging>car</packaging>
 
     <dependencies>
-
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -68,7 +67,6 @@
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/client/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-security/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-security/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-security/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>client</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>client-security</artifactId>
-    <name>Geronimo Configs :: J2EE Client Security</name>
+    <name>Geronimo Plugins, Client :: Security</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -45,7 +44,7 @@
 
         <!-- not needed in m1 -->
         <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
             <!--<artifactId>geronimo-security</artifactId>-->
             <!--<version>${version}</version>-->
         <!--</dependency>-->
@@ -77,8 +76,8 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false"/>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-security//car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-security/${version}/car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security//car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security/${version}/car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,27 +23,26 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>client</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>client</artifactId>
-    <name>Geronimo Configs :: J2EE Client</name>
+    <name>Geronimo Plugins, Client :: Client</name>
     <packaging>car</packaging>
 
     <dependencies>
-
         <!-- parent config -->
         <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>jee-specs</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -51,44 +50,44 @@
 
         <!-- ThreadPool -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-interceptor</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>
 
         <!-- should be transitive dependency of geronimo-j2ee -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</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>
@@ -120,7 +119,6 @@
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-naming</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -145,4 +143,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -6,13 +6,13 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-    
+
        http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See te License for the specific language governing permissions and
+    See the License for the specific language governing permissions and
     limitations under the License.
 -->
 
@@ -21,37 +21,35 @@
 <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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>client</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-client-builder</artifactId>
-    <name>Geronimo Modules :: Client Builder</name>
+    <name>Geronimo Plugins, Client :: Builder</name>
     
     <dependencies>
-        
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,26 +23,25 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>client</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-client</artifactId>
-    <name>Geronimo Modules :: Client</name>
+    <name>Geronimo Plugins, Client :: Core</name>
     
     <dependencies>
-
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${version}</version>
         </dependency>
 
         <!-- g-system comes from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
         </dependency>
@@ -53,7 +52,6 @@
             <artifactId>geronimo-transaction</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,21 +15,27 @@
     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>client</artifactId>
-    <name>Geronimo Plugins :: client</name>
+    <name>Geronimo Plugins, Client</name>
     <packaging>pom</packaging>
+    
     <description>
-        client plugin
+        Client plugin
     </description>
+    
     <modules>
         <module>client</module>
         <module>client-deployer</module>
@@ -37,4 +43,5 @@
         <module>geronimo-client</module>
         <module>geronimo-client-builder</module>
     </modules>
+
 </project>

Modified: geronimo/server/trunk/plugins/clustering/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,28 +23,30 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>clustering</artifactId>
-    <name>Geronimo Configs :: Clustering</name>
+    <name>Geronimo Plugins, Clustering :: Clustering</name>
     <packaging>car</packaging>
 
     <description>
         Basic clustering support in use with WADI
     </description>
+    
     <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>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -58,7 +60,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>
@@ -69,7 +71,6 @@
             <artifactId>geronimo-clustering</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/clustering/farming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,35 +16,37 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 609072 $ $Date: 2008-01-05 11:47:14 +1100 (Sat, 05 Jan 2008) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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>clustering</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>farming</artifactId>
-    <name>Geronimo Configs :: Farming</name>
+    <name>Geronimo Plugins, Clustering :: Farming</name>
     <packaging>car</packaging>
 
     <description>
         Basic farming support
     </description>
+    
     <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>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -58,7 +60,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>
@@ -69,7 +71,6 @@
             <artifactId>geronimo-farm</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,25 +16,25 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-clustering-wadi</artifactId>
-    <name>Geronimo Modules :: Clustering WADI</name>
+    <name>Geronimo Plugins, Clustering :: WADI Core</name>
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-clustering</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,43 +16,43 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-clustering</artifactId>
-    <name>Geronimo Modules :: Clustering</name>
+    <name>Geronimo Plugins, Clustering :: Core</name>
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-jmx-remoting</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,43 +16,43 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
 
 <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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-farm</artifactId>
-    <name>Geronimo Modules :: Farm</name>
+    <name>Geronimo Plugins, Clustering :: Farm</name>
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-jmx-remoting</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,21 +15,27 @@
     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>clustering</artifactId>
-    <name>Geronimo Plugins :: clustering</name>
+    <name>Geronimo Plugins, Clustering</name>
     <packaging>pom</packaging>
+    
     <description>
         clustering plugin
     </description>
+    
     <modules>
         <module>geronimo-clustering</module>
         <module>geronimo-clustering-wadi</module>
@@ -38,4 +44,5 @@
         <module>wadi-clustering</module>
         <module>farming</module>
     </modules>
+
 </project>

Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>wadi-clustering</artifactId>
-    <name>Geronimo Configs :: Clustering over WADI</name>
+    <name>Geronimo Plugins, Clustering :: WADI</name>
     <packaging>car</packaging>
 
     <description>

Modified: geronimo/server/trunk/plugins/connector/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/client-transaction/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/client-transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/client-transaction/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>connector</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>client-transaction</artifactId>
-    <name>Geronimo Configs :: J2EE Client transaction</name>
+    <name>Geronimo Plugins, Connector :: Client transaction</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -80,11 +79,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-transformer</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -109,4 +107,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,16 +21,16 @@
 <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>connector</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>connector-deployer</artifactId>
-    <name>Geronimo Configs :: Connector Deployer</name>
+    <name>Geronimo Plugins, Connector :: Deployer</name>
     <packaging>car</packaging>
 
     <description>
@@ -38,7 +38,6 @@
     </description>
     
     <dependencies>
-    
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
@@ -59,7 +58,6 @@
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
     
     <build>
@@ -135,4 +133,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,31 +23,30 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>connector</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-connector-builder</artifactId>
-    <name>Geronimo Modules :: Connector :: Builder</name>
+    <name>Geronimo Plugins, Connector :: Builder</name>
     
     <dependencies>
-        
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${version}</version>
         </dependency>
@@ -58,19 +57,18 @@
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-test-ddbean</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>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,17 +23,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>connector</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-connector</artifactId>
-    <name>Geronimo Modules :: Connector</name>
+    <name>Geronimo Plugins, Connector :: Core</name>
 
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-connector</artifactId>
@@ -46,20 +45,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${version}</version>
         </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.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deployment</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
         </dependency>
@@ -81,7 +80,7 @@
             <groupId>regexp</groupId>
             <artifactId>regexp</artifactId>
         </dependency>
-
     </dependencies>
+
 </project>
 

Modified: geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>connector</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-transaction</artifactId>
-    <name>Geronimo Modules :: Transaction</name>
+    <name>Geronimo Plugins, Connector :: Transaction</name>
     
     <dependencies>
         <dependency>
@@ -39,13 +39,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,21 +15,27 @@
     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>connector</artifactId>
-    <name>Geronimo Plugins :: connector</name>
+    <name>Geronimo Plugins, Connector</name>
     <packaging>pom</packaging>
+    
     <description>
-        connector plugin
+        Connector plugin
     </description>
+    
     <modules>
         <module>client-transaction</module>
         <module>connector-deployer</module>
@@ -38,4 +44,5 @@
         <module>geronimo-transaction</module>
         <module>transaction</module>
     </modules>
+
 </project>

Modified: geronimo/server/trunk/plugins/connector/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/transaction/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/transaction/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,22 +21,21 @@
 <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>connector</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>transaction</artifactId>
-    <name>Geronimo Configs :: Transaction Manager (JTA11)</name>
+    <name>Geronimo Plugins, Connector :: Transaction Manager (JTA11)</name>
     <packaging>car</packaging>
 
     <description>Geronimo transaction manager module.</description>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
@@ -45,7 +44,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>
@@ -53,7 +52,7 @@
 
         <!-- ThreadPool -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${version}</version>
         </dependency>
@@ -87,7 +86,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-transformer</artifactId>
             <version>${version}</version>
         </dependency>
@@ -96,7 +95,6 @@
             <groupId>org.objectweb.howl</groupId>
             <artifactId>howl</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,18 +26,17 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-base-portlets</artifactId>
-    <name>Geronimo Plugins :: Administration Console Base Portlets</name>
+    <name>Geronimo Plugins, Console :: Base Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
 
         <!-- for jspc maven plugin -->
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jee-specs</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -53,19 +52,21 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
             <scope>provided</scope>

Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-core/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-core</artifactId>
-    <name>Geronimo Plugins :: Administration Console Core Classes</name>
+    <name>Geronimo Plugins, Console :: Core</name>
     <packaging>jar</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
@@ -61,7 +59,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
@@ -78,7 +76,6 @@
             <artifactId>dwr</artifactId>
             <scope>provided</scope>
         </dependency>
-        
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-ear/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-ear/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-ear/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,11 +26,10 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-ear</artifactId>
-    <name>Geronimo Plugins :: Administration Console EAR</name>
+    <name>Geronimo Plugins, Console :: EAR</name>
     <packaging>ear</packaging>
     
     <dependencies>

Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-jetty</artifactId>
-    <name>Geronimo Plugins :: Administration Console - Jetty</name>
+    <name>Geronimo Plugins, Console :: Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-ear</artifactId>
@@ -44,7 +42,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>
@@ -86,6 +84,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-deployer</artifactId>
@@ -93,6 +92,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -108,13 +108,13 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -152,4 +152,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,18 +26,16 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-portal-driver</artifactId>
-    <name>Geronimo Plugins :: Administration Console Portal Driver</name>
+    <name>Geronimo Plugins, Console :: Portal Driver</name>
     <packaging>war</packaging>
 
     <dependencies>
-    
         <!-- for jspc maven plugin -->
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jee-specs</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -72,12 +70,11 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-tomcat</artifactId>
-    <name>Geronimo Plugins :: Administration Console - Tomcat</name>
+    <name>Geronimo Plugins, Console :: Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-ear</artifactId>
@@ -44,7 +42,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>
@@ -86,6 +84,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
@@ -93,6 +92,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -108,13 +108,13 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -152,4 +152,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/console/geronimo-converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/geronimo-converter/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/geronimo-converter/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/geronimo-converter/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,24 +23,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-converter</artifactId>
-    <name>Geronimo :: Configuration Converter</name>
+    <name>Geronimo Plugins, Console :: Configuration Converter</name>
     
     <dependencies>
-
-        <!-- g-kernel comes transitively from this -->    
+        <!-- g-kernel comes transitively from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>plugin-console-jetty</artifactId>
-    <name>Geronimo Plugins :: Administration Console Plugin and Deployment Portlets - Jetty</name>
+    <name>Geronimo Plugins, Console :: Plugin and Deployment Portlets (Jetty)</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>plugin-portlets</artifactId>
@@ -82,6 +80,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -89,7 +88,6 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,13 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>plugin-console-tomcat</artifactId>
-    <name>Geronimo Plugins :: Administration Console Plugin and Deployment Portlets - Tomcat</name>
+    <name>Geronimo Plugins, Console :: Plugin and Deployment Portlets (Tomcat)</name>
     <packaging>car</packaging>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>plugin-portlets</artifactId>
@@ -82,6 +80,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -89,7 +88,6 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>