geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r419353 [5/6] - 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 Wed, 05 Jul 2006 21:58:52 GMT
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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -29,7 +29,31 @@
 
     <artifactId>geronimo-j2ee-builder</artifactId>
     <name>Geronimo :: J2EE :: Builder</name>
-
+    
+    <dependencies>
+        
+        <!-- Module Dependencies -->
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+        
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
@@ -58,41 +82,12 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
-                    <download>true</download>
                     <sourceSchemas>geronimo-application-1.1.xsd</sourceSchemas>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-        </dependency>
-    </dependencies>
 </project>
 

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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/pom.xml Wed Jul  5 14:58:47 2006
@@ -21,6 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
+    
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
@@ -29,47 +30,41 @@
     
     <artifactId>geronimo-j2ee-schema</artifactId>
     <name>Geronimo :: J2EE Schema</name>
-    <description>Geronimo J2EE schema</description>
-
+    
+    <dependencies>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+        
+        <!-- Test Dependencies -->
+        
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
                 <configuration>
-                    <download>true</download>
-                    <sourceSchemas>j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd</sourceSchemas>
-                    <schemaDirectory>src</schemaDirectory>
-                    <!-- <catalogLocation>src/catalog</catalogLocation> -->
+                    <schemaDirectory>${pom.basedir}/src</schemaDirectory>
+                    <sourceSchemas>j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd</sourceSchemas>
                     <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/conf</xmlConfig>
+                        <xmlConfig implementation="java.io.File">${pom.basedir}/src/conf</xmlConfig>
                     </xmlConfigs>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee/pom.xml Wed Jul  5 14:58:47 2006
@@ -50,11 +50,13 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>

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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -29,52 +29,48 @@
 
     <artifactId>geronimo-jetty-builder</artifactId>
     <name>Geronimo :: Jetty :: Builder</name>
+    
+    <dependencies>
+        
+        <!-- Module Dependencies -->
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
-                    <download>true</download>
                     <sourceSchemas>geronimo-jetty-1.1.xsd,geronimo-jetty-config-1.0.xsd</sourceSchemas>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty</artifactId>
-        </dependency>
-    </dependencies>
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml Wed Jul  5 14:58:47 2006
@@ -57,21 +57,25 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
@@ -79,6 +83,7 @@
             <artifactId>org.mortbay.jetty</artifactId>
             <version>${jettyVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>
@@ -100,19 +105,18 @@
         <dependency>
             <groupId>commons-el</groupId>
             <artifactId>commons-el</artifactId>
-            <version>${commonsElVersion}</version>
         </dependency>
- 
-       <dependency>
+
+        <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>${commonsCollectionsVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>commons-primitives</groupId>
             <artifactId>commons-primitives</artifactId>
-            <version>${commonsPrimitivesVersion}</version>
         </dependency>
     </dependencies>
+
 </project>
 

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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting/pom.xml Wed Jul  5 14:58:47 2006
@@ -32,10 +32,11 @@
     <description>Provides remote access to a Geronimo server using JSR 160 JMX Remoting</description>
 
     <dependencies>
-        <!-- gets mx4j transitively -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <!-- all the specs should be added to the classpath transitively -->

Modified: geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/mail/pom.xml Wed Jul  5 14:58:47 2006
@@ -50,16 +50,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/management/pom.xml Wed Jul  5 14:58:47 2006
@@ -40,11 +40,13 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -29,89 +29,61 @@
 
     <artifactId>geronimo-naming-builder</artifactId>
     <name>Geronimo :: Naming :: Builder</name>
-    <description>Geronimo Naming Builder</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <download>true</download>
-                    <sourceSchemas>geronimo-naming-1.1.xsd</sourceSchemas>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+    
     <dependencies>
+        
+        <!-- Module Dependencies -->
+        
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-
+        
+        <!-- Spec Dependencies -->
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
@@ -121,11 +93,42 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
 
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>geronimo-naming-1.1.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/pom.xml Wed Jul  5 14:58:47 2006
@@ -17,7 +17,11 @@
 
 <!-- $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>
@@ -29,79 +33,59 @@
 
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>modules-parent</artifactId>
+    <name>Geronimo :: Modules</name>
     <packaging>pom</packaging>
-    <name>Geronimo Modules</name>
-    <description>Geronimo Modules</description>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>activation</module>
-                <module>activemq-embedded-rar</module>
-                <module>axis</module>
-                <module>axis-builder</module>
-                <module>client</module>
-                <module>client-builder</module>
-                <module>common</module>
-                <module>connector</module>
-                <module>connector-builder</module>
-                <module>converter</module>
-                <module>core</module>
-                <module>deploy-config</module>
-                <module>deploy-jsr88</module>
-                <module>deploy-tool</module>
-                <module>deployment</module>
-                <module>derby</module>
-                <module>directory</module>
-                <module>hot-deploy</module>
-                <module>installer-processing</module>
-                <!-- <module>installer-support</module> -->
-                <module>interceptor</module>
-                <module>j2ee</module>
-                <module>j2ee-builder</module>
-                <module>j2ee-schema</module>
-                <module>jetty</module>
-                <module>jetty-builder</module>
-                <module>javamail-transport</module>
-                <module>jmx-remoting</module>
-                <module>kernel</module>
-                <module>management</module>
-                <module>mail</module>
-                <module>naming</module>
-                <module>naming-builder</module>
-                <module>scripts</module>
-                <module>security</module>
-                <module>security-builder</module>
-                <module>service-builder</module>
-                <!-- <module>session</module> -->
-                <!-- <module>spring</module> -->
-                <module>system</module>
-                <module>test-ddbean</module>
-                <module>timer</module>
-                <module>tomcat</module>
-                <module>tomcat-builder</module>
-                <module>transaction</module>
-                <module>upgrade</module>
-                <module>util</module>
-                <module>web-builder</module>
-                <module>webservices</module>
-            </modules>
-        </profile>
-
-        <profile>
-            <id>singlemodule</id>
-            <activation>
-                <property>
-                    <name>module</name>
-                </property>
-            </activation>
-            <modules>
-                <module>${module}</module>
-            </modules>
-        </profile>
-    </profiles>
+    
+    <modules>
+        <module>activation</module>
+        <module>activemq-embedded-rar</module>
+        <module>axis</module>
+        <module>axis-builder</module>
+        <module>client</module>
+        <module>client-builder</module>
+        <module>common</module>
+        <module>connector</module>
+        <module>connector-builder</module>
+        <module>converter</module>
+        <module>core</module>
+        <module>deploy-config</module>
+        <module>deploy-jsr88</module>
+        <module>deploy-tool</module>
+        <module>deployment</module>
+        <module>derby</module>
+        <module>directory</module>
+        <module>hot-deploy</module>
+        <module>installer-processing</module>
+        <!-- <module>installer-support</module> -->
+        <module>interceptor</module>
+        <module>j2ee</module>
+        <module>j2ee-builder</module>
+        <module>j2ee-schema</module>
+        <module>jetty</module>
+        <module>jetty-builder</module>
+        <module>javamail-transport</module>
+        <module>jmx-remoting</module>
+        <module>kernel</module>
+        <module>management</module>
+        <module>mail</module>
+        <module>naming</module>
+        <module>naming-builder</module>
+        <module>scripts</module>
+        <module>security</module>
+        <module>security-builder</module>
+        <module>service-builder</module>
+        <!-- <module>session</module> -->
+        <!-- <module>spring</module> -->
+        <module>system</module>
+        <module>test-ddbean</module>
+        <module>timer</module>
+        <module>tomcat</module>
+        <module>tomcat-builder</module>
+        <module>transaction</module>
+        <module>upgrade</module>
+        <module>util</module>
+        <module>web-builder</module>
+        <module>webservices</module>
+    </modules>
+    
 </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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/security-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/security-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -28,86 +28,87 @@
     </parent>
 
     <artifactId>geronimo-security-builder</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Security :: Builder</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <download>true</download>
-                    <sourceSchemas>geronimo-security-1.1.xsd,geronimo-login-config-1.1.xsd</sourceSchemas>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+    <packaging>jar</packaging>
+    
     <dependencies>
+        
+        <!-- Module Dependencies -->
+        
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <!--needed only because security schema references j2ee 1.4 schema for description element -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+        
         <!-- provided by kernel -->
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
             <scope>provided</scope>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>geronimo-security-1.1.xsd,geronimo-login-config-1.1.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/service-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/service-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -29,67 +29,66 @@
 
     <artifactId>geronimo-service-builder</artifactId>
     <name>Geronimo :: Service :: Builder</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <download>true</download>
-                    <sourceSchemas>geronimo-module-1.1.xsd,geronimo-javabean-xmlattribute-1.0.xsd</sourceSchemas>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+    
     <dependencies>
+        
+        <!-- Module Dependencies -->
+        
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>geronimo-module-1.1.xsd,geronimo-javabean-xmlattribute-1.0.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml Wed Jul  5 14:58:47 2006
@@ -90,7 +90,7 @@
 copyright=Copyright (C) 2003-${build.year}, The Apache Software Foundation</echo>
                                 <echo file="${basedir}/target/classes/META-INF/product-versions.properties">
 #####Generated by Maven ####
-geronimo=${geronimoVersion}
+geronimo=${pom.version}
 activemq=${activemqVersion}
 openejb=${openejbVersion} tranql=${tranqlVersion}
 </echo>
@@ -130,21 +130,24 @@
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
-        <!-- cglib, mx4j, mx4j-remote, logging, log4j coming from kernel -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
  
         <dependency>

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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean/pom.xml Wed Jul  5 14:58:47 2006
@@ -50,11 +50,13 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
+            <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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/timer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/timer/pom.xml Wed Jul  5 14:58:47 2006
@@ -35,26 +35,31 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
@@ -79,8 +84,8 @@
         </dependency>
 
         <dependency>
-        <!--License is at http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt -->
-        <!-- it is modified BSD -->
+            <!--License is at http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt -->
+            <!-- it is modified BSD -->
             <groupId>xpp3</groupId>
             <artifactId>xpp3</artifactId>
         </dependency>

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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -35,7 +35,100 @@
         <endorsedDir>${buildDir}/endorsed</endorsedDir>
         <localRepoDir>${settings.localRepository}</localRepoDir>
     </properties>
+    
+    <dependencies>
+        
+        <!-- Module Dependencies -->
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
 
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-tomcat</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+        
+        <!-- Test Dependencies -->
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+    </dependencies>
+    
     <build>
         <!-- move this to parent pom -->
         <resources>
@@ -65,20 +158,8 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
-                    <schemaDirectory>src/schema</schemaDirectory>
                     <sourceSchemas>geronimo-tomcat-1.1.xsd,geronimo-tomcat-config-1.0.xsd</sourceSchemas>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
                 </configuration>
             </plugin>
 
@@ -115,80 +196,5 @@
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.4_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-tomcat</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-axis</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commonsIoVersion}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat/pom.xml Wed Jul  5 14:58:47 2006
@@ -125,36 +125,43 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- cglib, commons-logging, log4j, mx4j coming from kernel --> 
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
@@ -176,8 +183,8 @@
         </dependency>
 
         <!--
-      - Required until any realm is provided to Tomcat
-      - See StandardEngine::getRealm() 
+          - Required until any realm is provided to Tomcat
+          - See StandardEngine::getRealm() 
         -->
         <dependency>
             <groupId>tomcat</groupId>
@@ -242,55 +249,46 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>${xercesVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
-            <version>${xmlApisVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>${commonsBeanutilsVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>${commonsCollectionsVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
-            <version>${commonsDigesterVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-el</groupId>
             <artifactId>commons-el</artifactId>
-            <version>${commonsElVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>${commonsLoggingVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-modeler</groupId>
             <artifactId>commons-modeler</artifactId>
-            <version>${commonsModelerVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>regexp</groupId>
             <artifactId>regexp</artifactId>
-            <version>${regexpVersion}</version>
         </dependency>
 
         <dependency>
@@ -304,6 +302,8 @@
             <artifactId>wadi-tomcat55</artifactId>
             <version>${wadiVersion}</version>
         </dependency>
+        
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/transaction/pom.xml Wed Jul  5 14:58:47 2006
@@ -37,22 +37,26 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <!-- thread pool, for timer -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/upgrade/pom.xml Wed Jul  5 14:58:47 2006
@@ -45,16 +45,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- mx4j transitive -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- j2ee-schema transitive -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
     

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=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/web-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/web-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -30,94 +30,72 @@
     <artifactId>geronimo-web-builder</artifactId>
     <name>Geronimo :: Web :: Builder</name>
 
-    <description>Geronimo Web Container Deployer</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <download>true</download>
-                    <sourceSchemas>geronimo-web-1.1.xsd</sourceSchemas>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
+        
+        <!-- Module Dependencies -->
+        
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-
+        
+        <!-- Spec Dependencies -->
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
@@ -128,10 +106,36 @@
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
         </dependency>
         
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>geronimo-web-1.1.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 



Mime
View raw message