geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r420426 [2/2] - in /geronimo/sandbox/svkmerge/m2migration: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-stan...
Date Mon, 10 Jul 2006 05:04:45 GMT
Modified: geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,16 +17,13 @@
 
 <!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
 
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0">
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,16 +17,13 @@
 
 <!-- $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">
-    
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deploy-config/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deploy-config/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deploy-config/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,25 +17,27 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-deploy-config</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Deploy :: Common Config</name>
-    <description>The deployment module contains basic infrastructure and base classes for module builders / deployers. This module contains infrastructure and base classes for JSR-88 DConfigBeans.</description>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
+    <packaging>jar</packaging>
     
+    <description>
+        The deployment module contains basic infrastructure and base classes for 
+        module builders / deployers. This module contains infrastructure and base 
+        classes for JSR-88 DConfigBeans.
+    </description>
+
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>
@@ -52,5 +54,6 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,23 +17,20 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-deploy-jsr88</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Deploy :: JSR-88</name>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
+    <packaging>jar</packaging>
     
     <dependencies>
         <dependency>
@@ -106,5 +103,6 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -66,5 +67,6 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,25 +17,20 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-deployment</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Deployment</name>
-    <description>Geronimo Deployment</description>
 
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -65,5 +60,6 @@
             <artifactId>xml-resolver</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,18 +17,20 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-hot-deploy</artifactId>
     <name>Geronimo :: Deploy :: Hot Deployer</name>
+    
     <description>A GBean that implements a Hot Deploy directory</description>
 
     <dependencies>
@@ -88,5 +90,6 @@
         </dependency>
 
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/installer-processing/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/installer-processing/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/installer-processing/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/installer-processing/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -37,5 +38,6 @@
             <version>2.4.0</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -58,10 +59,10 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="setup.xml">
-                                    <property name="izpack_version" value="${izpack_version}" />
-                                    <property name="maven.src.dir" value="${basedir}/src" />
-                                    <property name="maven.build.dir" value="${project.build.directory}" />
-                                    <property name="maven.repo.local" value="${settings.localRepository}" />
+                                    <property name="izpack_version" value="${izpack_version}"/>
+                                    <property name="maven.src.dir" value="${basedir}/src"/>
+                                    <property name="maven.build.dir" value="${project.build.directory}"/>
+                                    <property name="maven.repo.local" value="${settings.localRepository}"/>
                                 </ant>
                             </tasks>
                         </configuration>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/interceptor/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/interceptor/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/interceptor/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev: 411333 $ $Date: 2006-06-02 16:35:57 -0700 (Fri, 02 Jun 2006) $ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -32,6 +33,7 @@
     <packaging>jar</packaging>
     
     <build>
+        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
         <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
         <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
     </build>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -64,12 +65,17 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <echo message="classpath=${project.compileClasspathElements}" file="classpath.properties" />
+                                <!--
+                                
+                                FIXME: WTF is this for?  Document or remove
+                                
+                                -->
+                                <echo message="classpath=${project.compileClasspathElements}" file="classpath.properties"/>
                                 <ant antfile="${basedir}/src/test/test-setup.xml">
-                                    <property name="maven.compile.source" value="1.4" />
-                                    <property name="maven.compile.target" value="1.4" />
+                                    <property name="maven.compile.source" value="1.4"/>
+                                    <property name="maven.compile.target" value="1.4"/>
                                 </ant>
-                                <delete file="classpath.properties" failonerror="false" />
+                                <delete file="classpath.properties" failonerror="false"/>
                             </tasks>
                         </configuration>
                         <goals>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,13 +17,14 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/javamail-transport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/javamail-transport/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/javamail-transport/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/javamail-transport/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,19 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-javamail-transport</artifactId>
     <name>Geronimo :: JavaMail Transport</name>
-    <description>Geronimo JavaMail Transport</description>
 
     <dependencies>
         <dependency>
@@ -42,5 +42,6 @@
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,18 +17,20 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-jmx-remoting</artifactId>
     <name>Geronimo :: JMX Remoting</name>
+    
     <description>Provides remote access to a Geronimo server using JSR 160 JMX Remoting</description>
 
     <dependencies>
@@ -45,5 +47,6 @@
             <artifactId>mx4j-remote</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,18 +17,20 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-management</artifactId>
     <name>Geronimo :: Management API</name>
+    
     <description>Contains interfaces that define the management API for Geronimo</description>
 
     <dependencies>
@@ -49,5 +51,6 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/naming/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/naming/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/naming/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,20 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-naming</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Naming</name>
-    <description>Geronimo Naming</description>
 
     <dependencies>
         
@@ -55,6 +54,8 @@
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
         </dependency>
+        
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,22 +17,19 @@
 
 <!-- $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">
+<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</groupId>
-        <artifactId>geronimo-parent</artifactId>
+        <artifactId>geronimo</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>modules-parent</artifactId>
+    <artifactId>modules</artifactId>
     <name>Geronimo :: Modules</name>
     <packaging>pom</packaging>
     

Modified: geronimo/sandbox/svkmerge/m2migration/modules/scripts/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/scripts/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/scripts/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/scripts/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,18 +17,25 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-scripts</artifactId>
     <name>Geronimo :: Scripts</name>
-    <description>Scripts</description>
+    
+    <!--
+    
+    FIXME: This really belongs in an assembly module... not here
+    
+    -->
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/security-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/security-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/security-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,19 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-security-builder</artifactId>
     <name>Geronimo :: Security :: Builder</name>
-    <packaging>jar</packaging>
     
     <dependencies>
         
@@ -53,7 +53,7 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <!--needed only because security schema references j2ee 1.4 schema for description element -->
+        <!-- needed only because security schema references j2ee 1.4 schema for description element -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/security/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/security/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/service-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/service-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/service-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,14 +23,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-system</artifactId>
     <name>Geronimo :: System</name>
-    <packaging>jar</packaging>
     
     <dependencies>
         

Modified: geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,19 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-test-ddbean</artifactId>
     <name>Geronimo :: Test :: DDBeans</name>
-    <description>Geronimo Test DDBeans</description>
 
     <dependencies>
         <dependency>
@@ -59,5 +59,6 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/timer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/timer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/timer/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,19 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-timer</artifactId>
     <name>Geronimo :: Timer</name>
-    <description>Geronimo Timer</description>
 
     <dependencies>
         <dependency>
@@ -105,5 +105,6 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,20 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-transaction</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Transaction</name>
-    <description>Geronimo Transaction</description>
 
     <dependencies>
         <!-- temp, for ServerInfo. Remove when it is moved to Kernel-->

Modified: geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,19 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-upgrade</artifactId>
     <name>Geronimo :: Upgrade</name>
-    <description>Geronimo Upgrade</description>
 
     <dependencies>
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/util/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/util/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/util/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,19 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-util</artifactId>
     <name>Geronimo :: Util</name>
-    <description>Geronimo Util</description>
 
     <dependencies>
         <dependency>
@@ -37,5 +37,6 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/web-builder/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/web-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/web-builder/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,19 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-webservices</artifactId>
     <name>Geronimo :: Web Services</name>
-    <description>Geronimo Web Services</description>
 
     <build>
         <resources>
@@ -116,5 +116,6 @@
             <artifactId>scout</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Sun Jul  9 22:04:39 2006
@@ -28,7 +28,7 @@
     </parent>
     
     <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo-parent</artifactId> <!-- FIXME: Drop all -parent bits -->
+    <artifactId>geronimo</artifactId>
     <name>Geronimo</name>
     <packaging>pom</packaging>
     



Mime
View raw message