geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r614367 [7/8] - in /geronimo/server/trunk: ./ applications/ applications/ca-helper/ca-helper-jetty/ applications/ca-helper/ca-helper-tomcat/ applications/ca-helper/geronimo-ca-helper/ applications/geronimo-uddi-db/ applications/mejb/ applic...
Date Tue, 22 Jan 2008 23:00:03 GMT
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/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>j2ee</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsr88-jar-configurer</artifactId>
-    <name>Geronimo Configs :: JSR88 JAR Configurer</name>
+    <name>Geronimo Plugins, J2EE :: JSR-88 JAR Configurer</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <scope>runtime</scope>
@@ -48,9 +47,8 @@
             <artifactId>geronimo-client-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -61,18 +59,18 @@
                         <value>false</value>
                     </useMavenDependencies>
                     <dependencies>
-                      <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-client-builder</artifactId>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>jsr88-cli</artifactId>
-                        <type>car</type>
-                        <import>classes</import>
-                      </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-client-builder</artifactId>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>jsr88-cli</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
                     </dependencies>
                     <category>Deployment</category>
                     <instance>
@@ -84,4 +82,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/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>j2ee</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsr88-rar-configurer</artifactId>
-    <name>Geronimo Configs :: JSR88 RAR Configurer</name>
+    <name>Geronimo Plugins, J2EE :: JSR-88 RAR Configurer</name>
     <packaging>car</packaging>
     
     <dependencies>
-    
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <scope>runtime</scope>
@@ -50,7 +49,6 @@
             <scope>runtime</scope>
             <type>car</type>
         </dependency>
-
     </dependencies>
     
     <build>
@@ -70,7 +68,7 @@
                             <import>classes</import>
                         </dependency>
                         <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>jsr88-cli</artifactId>
                             <type>car</type>
                             <import>classes</import>
@@ -86,4 +84,5 @@
             </plugin>
         </plugins>
     </build>
+ 
 </project>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,20 +23,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>j2ee</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsr88-war-configurer</artifactId>
-    <name>Geronimo Configs :: JSR88 WAR Configurer</name>
+    <name>Geronimo Plugins, J2EE :: JSR-88 WAR Configurer</name>
     <packaging>car</packaging>
     
     <dependencies>
-        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <scope>runtime</scope>
@@ -48,7 +47,6 @@
             <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
     
     <build>
@@ -68,7 +66,7 @@
                             <import>classes</import>
                         </dependency>
                         <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>jsr88-cli</artifactId>
                             <type>car</type>
                             <import>classes</import>
@@ -84,4 +82,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/pom.xml Tue Jan 22 14:59:41 2008
@@ -17,25 +17,26 @@
 -->
 <!-- $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>j2ee</artifactId>
-    <name>Geronimo Plugins :: j2ee</name>
+    <name>Geronimo Plugins, J2EE</name>
     <packaging>pom</packaging>
+    
     <description>
-        j2ee plugin
+        J2EE plugin
     </description>
+    
     <modules>
-      <!--
-        <module>geronimo-j2ee</module>
-        -->
-      <module>geronimo-j2ee-builder</module>
-      <module>j2ee-deployer</module>
+        <module>geronimo-j2ee-builder</module>
+        <module>j2ee-deployer</module>
         <module>geronimo-j2ee-schema</module>
         <module>geronimo-naming-builder</module>
         <module>geronimo-security-builder</module>
@@ -50,4 +51,5 @@
         <module>unavailable-ejb-deployer</module>
         <module>unavailable-webservices-deployer</module>
     </modules>
+
 </project>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,27 +21,25 @@
 <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>j2ee</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>unavailable-client-deployer</artifactId>
-    <name>Geronimo Configs :: Unavailable Client Deployer</name>
+    <name>Geronimo Plugins, J2EE :: Unavailable Client Deployer</name>
     <packaging>car</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,27 +21,25 @@
 <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>j2ee</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>unavailable-ejb-deployer</artifactId>
-    <name>Geronimo Configs :: Unavailable EJB Deployer</name>
+    <name>Geronimo Plugins, J2EE :: Unavailable EJB Deployer</name>
     <packaging>car</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,27 +21,25 @@
 <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>j2ee</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>unavailable-webservices-deployer</artifactId>
-    <name>Geronimo Configs :: Unavailable Web Services Deployer</name>
+    <name>Geronimo Plugins, J2EE :: Unavailable Web Services Deployer</name>
     <packaging>car</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/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>
-        <artifactId>modules</artifactId>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jasper</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jasper-builder</artifactId>
-    <name>Geronimo Modules :: Jasper Builder</name>
+    <name>Geronimo Plugins, Jasper :: Builder</name>
     
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/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>jasper</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jasper</artifactId>
-    <name>Geronimo Modules :: Jasper</name>
+    <name>Geronimo Plugins, Jasper :: Core</name>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>jasper</artifactId>
@@ -50,12 +49,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>
@@ -66,24 +65,26 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jsp_2.1_spec</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-el_1.0_spec</artifactId>
         </dependency>
+        
         <dependency>
           <groupId>org.apache.tomcat</groupId>
           <artifactId>juli</artifactId>
         </dependency>
+        
         <dependency>
           <groupId>org.apache.tomcat</groupId>
           <artifactId>catalina</artifactId>
         </dependency>
-
-
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,20 +23,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jasper</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jasper-deployer</artifactId>
-    <name>Geronimo Configs :: Jasper Deployer</name>
+    <name>Geronimo Plugins, Jasper :: Deployer</name>
     <packaging>car</packaging>
 
-    <description>Deployer for Jasper jsps.  Installs injection support components.</description>
+    <description>Deployer for Jasper jsps. Installs injection support components.</description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
@@ -97,4 +96,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,20 +23,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jasper</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jasper</artifactId>
-    <name>Geronimo Configs :: Jasper</name>
+    <name>Geronimo Plugins, Jasper :: Jasper</name>
     <packaging>car</packaging>
 
     <description>Geronimo Jasper jsp integration including injection support.</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>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -88,7 +87,6 @@
             <groupId>org.apache.tomcat.extras</groupId>
             <artifactId>juli</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,22 +26,21 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jasper</artifactId>
-    <name>Geronimo Plugins :: jasper</name>
+    <name>Geronimo Plugins, Jasper</name>
     <packaging>pom</packaging>
 
     <description>
-        jasper plugin
+        Jasper plugin
     </description>
 
     <modules>
-<module>geronimo-jasper</module>
-<module>geronimo-jasper-builder</module>
-<module>jasper</module>
-<module>jasper-deployer</module>
+        <module>geronimo-jasper</module>
+        <module>geronimo-jasper-builder</module>
+        <module>jasper</module>
+        <module>jasper-deployer</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,30 +23,31 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>javamail</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-mail</artifactId>
-    <name>Geronimo Modules :: Mail</name>
+    <name>Geronimo Plugins, JavaMail :: Core</name>
 
     <dependencies>
-
-        <!-- g-kernel, g-management comes transitively from this -->        
+        <!-- g-kernel, g-management comes transitively from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</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-management</artifactId>
             <version>${version}</version>
         </dependency>
@@ -61,7 +62,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/javamail/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/javamail/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/javamail/pom.xml (original)
+++ geronimo/server/trunk/plugins/javamail/javamail/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,24 +21,23 @@
 <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>javamail</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>javamail</artifactId>
-    <name>Geronimo Configs :: JavaMail</name>
+    <name>Geronimo Plugins, JavaMail :: JavaMail</name>
     <packaging>car</packaging>
 
     <description>Geronimo JavaMail 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>
@@ -46,7 +45,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -62,7 +61,6 @@
             <artifactId>geronimo-mail</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/pom.xml (original)
+++ geronimo/server/trunk/plugins/javamail/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,20 +26,19 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>javamail</artifactId>
-    <name>Geronimo Plugins :: javamail</name>
+    <name>Geronimo Plugins, JavaMail</name>
     <packaging>pom</packaging>
 
     <description>
-        javamail plugin
+        JavaMail plugin
     </description>
 
     <modules>
-<module>geronimo-mail</module>
-<module>javamail</module>
+        <module>geronimo-mail</module>
+        <module>javamail</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-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: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->
 
 <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>jaxws</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jaxws-builder</artifactId>
-    <name>Geronimo Modules :: JAXWS :: Builder</name>
+    <name>Geronimo Plugins, JAXWS :: Builder</name>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jaxws</artifactId>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-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: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->
 
 <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>jaxws</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jaxws-ejb-builder</artifactId>
-    <name>Geronimo Modules :: JAXWS :: EJB Builder</name>
+    <name>Geronimo Plugins, JAXWS :: EJB Builder</name>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jaxws-builder</artifactId>
@@ -45,7 +44,6 @@
             <artifactId>geronimo-openejb-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,31 +16,31 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->
 
 <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>jaxws</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jaxws</artifactId>
-    <name>Geronimo Modules :: JAXWS</name>
+    <name>Geronimo Plugins, JAXWS :: Core</name>
     
     <dependencies>
         <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-security</artifactId>
             <version>${version}</version>
         </dependency>
@@ -81,7 +81,6 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,20 +23,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jaxws</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jaxws-deployer</artifactId>
-    <name>Geronimo Configs :: JAXWS Deployer</name>
+    <name>Geronimo Plugins, JAXWS :: Deployer</name>
     <packaging>car</packaging>
 
     <description>Base configuration for JAX-WS Web services.</description>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
@@ -56,7 +55,6 @@
             <artifactId>geronimo-jaxws-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
     <build>
@@ -80,7 +78,7 @@
                     -->
                     <classpath>
                         <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
                             <version>${version}</version>
                         </element>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,27 +16,26 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 589641 $ $Date: 2007-10-29 10:43:01 -0400 (Mon, 29 Oct 2007) $ -->
+<!-- $Rev: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->
 
 <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>jaxws</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jaxws-ejb-deployer</artifactId>
-    <name>Geronimo Configs :: JAXWS EJB Deployer</name>
+    <name>Geronimo Plugins, JAXWS :: EJB Deployer</name>
     <packaging>car</packaging>
 
     <description>Base configuration for JAX-WS EJB Web services.</description>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jaxws-deployer</artifactId>
@@ -56,7 +55,6 @@
             <artifactId>geronimo-jaxws-ejb-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml Tue Jan 22 14:59:41 2008
@@ -16,27 +16,26 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 580112 $ $Date: 2007-09-27 13:35:15 -0400 (Thu, 27 Sep 2007) $ -->
+<!-- $Rev: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->
 
 <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>jaxws</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jaxws-tools</artifactId>
-    <name>Geronimo Configs :: JAXWS CLI Tools</name>
+    <name>Geronimo Plugins, JAXWS :: Tools</name>
     <packaging>resource-bundle</packaging>
 
     <description>JAX-WS command line tools</description>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jaxws-deployer</artifactId>
@@ -49,12 +48,10 @@
             <artifactId>geronimo-jaxws-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
     <build>
         <plugins>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -129,7 +126,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,15 +26,14 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jaxws</artifactId>
-    <name>Geronimo Plugins :: jaxws</name>
+    <name>Geronimo Plugins, JAXWS</name>
     <packaging>pom</packaging>
 
     <description>
-        jaxws plugin
+        JAXWS plugin
     </description>
 
     <modules>

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,26 +21,26 @@
 <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>jetty</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jetty6-builder</artifactId>
-    <name>Geronimo Modules :: Jetty 6 :: Builder</name>
+    <name>Geronimo Plugins, Jetty :: Builder</name>
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${version}</version>
         </dependency>
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty6</artifactId>
             <version>${version}</version>
         </dependency>
@@ -52,7 +52,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
             <classifier>tests</classifier>

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml Tue Jan 22 14:59:41 2008
@@ -19,34 +19,32 @@
 <!-- $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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jetty</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jetty6-clustering-builder-wadi</artifactId>
-    <name>Geronimo Modules :: Jetty 6 :: Clustering Builder for WADI</name>
+    <name>Geronimo Plugins, Jetty :: Clustering Builder for WADI Core</name>
     
     <dependencies>
-
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
             <version>${version}</version>
         </dependency>
 
         <!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/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: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->
 
 <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>jetty</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
-    <name>Geronimo Modules :: Jetty 6 Clustering over WADI</name>
+    <name>Geronimo Plugins, Jetty :: Clustering over WADI Core</name>
     
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml Tue Jan 22 14:59:41 2008
@@ -19,18 +19,18 @@
 <!-- $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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jetty</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-jetty6</artifactId>
-    <name>Geronimo Modules :: Jetty 6</name>
+    <name>Geronimo Plugins, Jetty :: Core</name>
     
     <dependencies>
         <dependency>
@@ -103,7 +103,6 @@
             <artifactId>xercesImpl</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
     
     <build>

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

Modified: geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/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>jetty</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jetty6-clustering-wadi</artifactId>
-    <name>Geronimo Configs :: Jetty 6 Clustering over WADI</name>
+    <name>Geronimo Plugins, Jetty :: Jetty 6 Clustering over WADI</name>
     <packaging>car</packaging>
 
     <description>WADI clustering for Jetty.</description>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,20 +23,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jetty</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jetty6-deployer</artifactId>
-    <name>Geronimo Configs :: Jetty Deployer</name>
+    <name>Geronimo Plugins, Jetty :: Deployer</name>
     <packaging>car</packaging>
 
     <description>Geronimo deployer for Jetty 6 Web Server integration.</description>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
@@ -71,7 +70,6 @@
             <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,20 +23,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>jetty</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jetty6</artifactId>
-    <name>Geronimo Configs :: Jetty 6</name>
+    <name>Geronimo Plugins, Jetty :: Jetty 6</name>
     <packaging>car</packaging>
 
     <description>Geronimo Jetty Web Server integration.</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>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -108,7 +107,6 @@
             <type>car</type>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -128,7 +126,7 @@
                             <type>car</type>
                         </dependency>
                         <dependency start="true">
-                            <groupId>org.apache.geronimo.configs</groupId>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>server-security-config</artifactId>
                             <type>car</type>
                         </dependency>

Modified: geronimo/server/trunk/plugins/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/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>jetty</artifactId>
-    <name>Geronimo Plugins :: jetty</name>
+    <name>Geronimo Plugins, Jetty</name>
     <packaging>pom</packaging>
+    
     <description>
-        jetty plugin
+        Jetty plugin
     </description>
+    
     <modules>
         <module>geronimo-jetty6</module>
         <module>geronimo-jetty6-builder</module>
@@ -40,4 +46,5 @@
         <module>jetty6-clustering-builder-wadi</module>
         <module>jetty6-clustering-wadi</module>
     </modules>
+
 </project>

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <artifactId>modules</artifactId>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>myfaces</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-myfaces-builder</artifactId>
-    <name>Geronimo Modules :: MyFaces Builder</name>
+    <name>Geronimo Plugins, MyFaces :: Builder</name>
     
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,24 +23,24 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <artifactId>modules</artifactId>
-        <groupId>org.apache.geronimo.modules</groupId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>myfaces</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-myfaces</artifactId>
-    <name>Geronimo Modules :: MyFaces</name>
+    <name>Geronimo Plugins, MyFaces :: Core</name>
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</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>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-deployer/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>myfaces</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>myfaces-deployer</artifactId>
-    <name>Geronimo Configs :: MyFaces Deployer</name>
+    <name>Geronimo Plugins, MyFaces :: Deployer</name>
     <packaging>car</packaging>
     
     <dependencies>
@@ -41,6 +41,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>myfaces</artifactId>
@@ -48,12 +49,12 @@
             <type>car</type>
             <scope>runtime</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-myfaces-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,26 +23,27 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>myfaces</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>myfaces</artifactId>
-    <name>Geronimo Configs :: MyFaces</name>
+    <name>Geronimo Plugins, MyFaces :: MyFaces</name>
     <packaging>car</packaging>
 
     <description>Geronimo MyFaces jsf integration</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>
             <scope>provided</scope>
         </dependency>
+        
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -50,6 +51,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-myfaces</artifactId>
@@ -85,7 +87,6 @@
             <groupId>commons-discovery</groupId>
             <artifactId>commons-discovery</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,22 +26,21 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>myfaces</artifactId>
-    <name>Geronimo Plugins :: myfaces</name>
+    <name>Geronimo Plugins, MyFaces</name>
     <packaging>pom</packaging>
 
     <description>
-        myfaces plugin
+        MyFaces plugin
     </description>
 
     <modules>
-<module>geronimo-myfaces</module>
-<module>geronimo-myfaces-builder</module>
-<module>myfaces</module>
-<module>myfaces-deployer</module>
+        <module>geronimo-myfaces</module>
+        <module>geronimo-myfaces-builder</module>
+        <module>myfaces</module>
+        <module>myfaces-deployer</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,20 +15,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!-- $Revision$ $Date$ -->
 
-<project>
-    <modelVersion>4.0.0</modelVersion>
+<!-- $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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openejb</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-openejb-builder</artifactId>
-    <name>Geronimo Modules :: OpenEJB :: Builder</name>
+    <name>Geronimo Plugins, OpenEJB :: Builder</name>
 
     <dependencies>
         <dependency>
@@ -98,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -15,62 +15,64 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!-- $Revision$ $Date$ -->
 
-<project>
-    <modelVersion>4.0.0</modelVersion>
+<!-- $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.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openejb</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-openejb</artifactId>
-    <name>Geronimo Modules :: OpenEJB</name>
+    <name>Geronimo Plugins, OpenEJB :: Core</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
             <exclusions>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-security</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-kernel</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-interceptor</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-naming</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-transaction</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-timer</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-webservices</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>stax</groupId>
-                <artifactId>stax-api</artifactId>
-              </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-security</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-kernel</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-connector</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-interceptor</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-naming</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-transaction</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-timer</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-webservices</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.openjpa</groupId>
                     <artifactId>openjpa-persistence-jdbc</artifactId>
@@ -82,29 +84,35 @@
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-ejbd</artifactId>
         </dependency>
+        
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>openejb-client</artifactId>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-client</artifactId>
         </dependency>
+        
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>openejb-server</artifactId>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-server</artifactId>
         </dependency>
+        
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>openejb-loader</artifactId>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-loader</artifactId>
         </dependency>
+        
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>openejb-jee</artifactId>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-jee</artifactId>
         </dependency>
+        
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>openejb-ejbd</artifactId>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-ejbd</artifactId>
         </dependency>
+        
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>openejb-javaagent</artifactId>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-javaagent</artifactId>
         </dependency>
 
         <dependency>
@@ -112,10 +120,10 @@
             <artifactId>jaxb-impl</artifactId>
             <version>2.0.3</version>
             <exclusions>
-	        <exclusion>
-	            <groupId>javax.xml</groupId>
-	            <artifactId>jsr173</artifactId>
-	        </exclusion>
+                <exclusion>
+                    <groupId>javax.xml</groupId>
+                    <artifactId>jsr173</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -126,11 +134,12 @@
             <artifactId>geronimo-connector</artifactId>
             <version>${version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-persistence-jpa10</artifactId>
             <version>${version}</version>
         </dependency>
-
     </dependencies>
+
 </project>

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml Tue Jan 22 14:59:41 2008
@@ -21,34 +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.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openejb</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>openejb-deployer</artifactId>
-    <name>Geronimo Configs :: OpenEJB Deployer</name>
+    <name>Geronimo Plugins, OpenEJB :: Deployer</name>
     <packaging>car</packaging>
 
     <description>Geronimo Deployer for OpenEJB Container.</description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
@@ -78,7 +79,6 @@
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>
         </dependency-->
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/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>openejb</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>openejb</artifactId>
-    <name>Geronimo Configs :: OpenEJB</name>
+    <name>Geronimo Plugins, OpenEJB :: OpenEJB</name>
     <packaging>car</packaging>
 
     <description>Geronimo integration of the OpenEJB  ejb container.</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>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -64,7 +63,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
@@ -76,38 +75,38 @@
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
             <exclusions>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-security</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-kernel</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-interceptor</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-naming</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-transaction</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-timer</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-webservices</artifactId>
-              </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-security</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-kernel</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-connector</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-interceptor</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.framework</groupId>
+                    <artifactId>geronimo-naming</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-transaction</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-timer</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-webservices</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -137,10 +136,9 @@
         </dependency>
 
         <dependency>
-             <groupId>org.apache.xbean</groupId>
-             <artifactId>xbean-finder</artifactId>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,22 +26,21 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>openejb</artifactId>
-    <name>Geronimo Plugins :: openejb</name>
+    <name>Geronimo Plugins, OpenEJB</name>
     <packaging>pom</packaging>
 
     <description>
-        openejb plugin
+        OpenEJB plugin
     </description>
 
     <modules>
-<module>geronimo-openejb</module>
-<module>geronimo-openejb-builder</module>
-<module>openejb</module>
-<module>openejb-deployer</module>
+        <module>geronimo-openejb</module>
+        <module>geronimo-openejb-builder</module>
+        <module>openejb</module>
+        <module>openejb-deployer</module>
     </modules>
 
 </project>

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

Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -21,19 +21,18 @@
 <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>openjpa</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
+    
+    <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-persistence-jpa10-builder</artifactId>
-    <name>Geronimo Modules :: Persistence JPA1.0 :: Builder</name>
+    <name>Geronimo Plugins, OpenJPA :: Persistence JPA 1.0 Builder</name>
 
     <dependencies>
-
         <!-- xbean-finder, g-service-builder, g-j2ee comes via g-j2ee-builder from this -->
         <!-- g-schema-jee_5 comes via g-j2ee-schema from this -->
         <dependency>
@@ -47,7 +46,6 @@
             <artifactId>geronimo-persistence-jpa10</artifactId>
             <version>${version}</version>                                                                                                           
         </dependency>
-
     </dependencies>
 
 </project>



Mime
View raw message