geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r420426 [1/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
Author: jdillon
Date: Sun Jul  9 22:04:39 2006
New Revision: 420426

URL: http://svn.apache.org/viewvc?rev=420426&view=rev
Log:
Normalize poms; adding schema information
Removed -parent suffix from modules with children (The artifactId should be the name of the directory)


Modified:
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-core/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/console/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/demo/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/ldap-realm-demo/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-client/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ear/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ejb/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-web/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/magicGball/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/remote-deploy/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/uddi-server/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/welcome/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/activemq-broker/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/axis/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/client-system/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/client/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/directory/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/hot-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/j2ee-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/j2ee-server/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/javamail/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/jetty-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/ldap-realm/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/openejb-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/openejb/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/upgrade/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/activation/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/deploy-config/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/installer-processing/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/interceptor/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/javamail-transport/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/kernel/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/naming/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/scripts/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/security-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/security/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/service-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/timer/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/util/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/web-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/webservices/pom.xml
    geronimo/sandbox/svkmerge/m2migration/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-core/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-core/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-core/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.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -53,13 +50,6 @@
     </dependencies>
 
     <build>
-    <!-- resources>
-      <resource>
-        <directory>${basedir}/src/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources -->
-    <!-- use the antrun plugin till we get timestamp plugin from Geronimo-1659 -->
         <plugins>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>

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

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/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.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

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

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/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.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.applications.console</groupId>
-    <artifactId>console-parent</artifactId>
+    <artifactId>console</artifactId>
     <packaging>pom</packaging>
     <name>Geronimo Applications :: Console</name>
 

Modified: geronimo/sandbox/svkmerge/m2migration/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/demo/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/demo/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/demo/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,23 +17,20 @@
 
 <!-- $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.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>demo</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Demo</name>
+    <packaging>war</packaging>
     
     <dependencies>
         <!-- Required for JSPC compilation -->

Modified: geronimo/sandbox/svkmerge/m2migration/applications/ldap-realm-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/ldap-realm-demo/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/ldap-realm-demo/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/ldap-realm-demo/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,23 +17,21 @@
 
 <!-- $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.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-ldap-demo</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: LDAP Demo</name>
+    <packaging>war</packaging>
+    
     <description>
         This is a very simple application that is intended to demonstrate the ldap
         security mechanism.

Modified: geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-client/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-client/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,10 +17,7 @@
 
 <!-- $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>
     
@@ -28,11 +25,10 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-client</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo Applications, The Magic G Ball :: Client</name>
 
     <dependencies>

Modified: geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ear/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ear/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ear/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,10 +17,7 @@
 
 <!-- $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>
     
@@ -28,13 +25,13 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-ear</artifactId>
-    <packaging>ear</packaging>
     <name>Geronimo Applications, The Magic G Ball :: EAR</name>
-
+    <packaging>ear</packaging>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>

Modified: geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ejb/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ejb/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-ejb/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,10 +17,7 @@
 
 <!-- $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>
     
@@ -28,11 +25,11 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
     
     <artifactId>magicGball-ejb</artifactId>
-    <packaging>ejb</packaging>
     <name>Geronimo Applications, The Magic G Ball :: EJB</name>
-
+    <packaging>ejb</packaging>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-web/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-web/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/magicGball/magicGball-web/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,10 +17,7 @@
 
 <!-- $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>
     
@@ -28,13 +25,13 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-web</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications, The Magic G Ball :: WAR</name>
-
+    <packaging>war</packaging>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>

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

Modified: geronimo/sandbox/svkmerge/m2migration/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/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.applications</groupId>
-    <artifactId>applications-parent</artifactId>
+    <artifactId>applications</artifactId>
     <name>Geronimo :: Applications</name>
     <packaging>pom</packaging>
     

Modified: geronimo/sandbox/svkmerge/m2migration/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/remote-deploy/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/remote-deploy/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/remote-deploy/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,23 +17,21 @@
 
 <!-- $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.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-remote-deploy</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Remote Deploy</name>
+    <packaging>war</packaging>
+    
     <description>
         This application is essentially a servlet that accepts file upload
         requests from remote clients, which is necessary for remote

Modified: geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/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.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

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

Modified: geronimo/sandbox/svkmerge/m2migration/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/welcome/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/welcome/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/welcome/pom.xml Sun Jul  9 22:04:39 2006
@@ -17,23 +17,21 @@
 
 <!-- $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.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-welcome</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Welcome</name>
+    <packaging>war</packaging>
+    
     <description>
         This is a very simple application that is intended to serve as the default page
         that can be viewed when the server is first installed so that someone can see

Modified: geronimo/sandbox/svkmerge/m2migration/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/activemq-broker/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/activemq-broker/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/activemq-broker/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/activemq/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/activemq/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/axis-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/axis/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/axis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/axis/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-corba/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client-security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/client-security/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

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

Modified: geronimo/sandbox/svkmerge/m2migration/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/client/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/directory/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/directory/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/geronimo-gbean-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/hot-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/hot-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/hot-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/hot-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-corba/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-security/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-server/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-server/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-server/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/j2ee-system/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/javamail/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/javamail/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/javamail/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/jetty-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jetty-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jetty-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/jetty/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jetty/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-jetty/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/ldap-demo-tomcat/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/ldap-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/ldap-realm/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/ldap-realm/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/ldap-realm/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/online-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/openejb-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/openejb-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/openejb-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/openejb/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/openejb/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/openejb/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/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.configs</groupId>
-    <artifactId>configs-parent</artifactId>
+    <artifactId>configs</artifactId>
     <name>Geronimo :: Configs</name>
     <packaging>pom</packaging>
     

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

Modified: geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/shutdown/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/system-database/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/tomcat/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/upgrade/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/upgrade/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/upgrade/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/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.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

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

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

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml Sun Jul  9 22:04:39 2006
@@ -23,13 +23,13 @@
     
     <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.plugins</groupId>
-    <artifactId>plugins-parent</artifactId>
+    <artifactId>plugins</artifactId>
     <name>Geronimo Plugins</name>
     <description>Geronimo :: Plugins</description>
     <packaging>pom</packaging>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activation/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activation/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activation/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/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar/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/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml?rev=420426&r1=420425&r2=420426&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/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>



Mime
View raw message