geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r419355 [1/6] - in /geronimo/sandbox/svkmerge/trunk: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-standard/ ...
Date Wed, 05 Jul 2006 22:05:50 GMT
Author: jdillon
Date: Wed Jul  5 15:05:45 2006
New Revision: 419355

URL: http://svn.apache.org/viewvc?rev=419355&view=rev
Log:
Merge changes from m2migration to (faux-)trunk to test SVK smerge w/real changes

Added:
    geronimo/sandbox/svkmerge/trunk/bootstrap   (with props)
    geronimo/sandbox/svkmerge/trunk/build
    geronimo/sandbox/svkmerge/trunk/build.bat   (with props)
Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-core/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-client/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/uddi-db/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/uddi-server/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/activemq-broker/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/client-corba/src/plan/plan.xml
    geronimo/sandbox/svkmerge/trunk/configs/client-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/client-security/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/client-system/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/console-jetty/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/console-tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/directory/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/geronimo-gbean-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/hot-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/j2ee-corba/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/j2ee-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/j2ee-security/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/j2ee-server/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/j2ee-system/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/javamail/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/jetty-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/jetty/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-jetty/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-jetty/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/ldap-realm/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/online-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/openejb-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/openejb/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/rmi-naming/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/servlets-examples-jetty/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/servlets-examples-tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/sharedlib/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/shutdown/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/system-database/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/tomcat-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/unavailable-client-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/unavailable-ejb-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/unavailable-webservices-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/upgrade-cli/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/upgrade/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/welcome-jetty/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/welcome-tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml
    geronimo/sandbox/svkmerge/trunk/m2-plugins/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean-management/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/axis-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/axis/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/client-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/client/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/common/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/connector-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/connector/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/converter/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/core/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/deployment/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/derby/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/directory/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/hot-deploy/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/installer-support/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/j2ee-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/j2ee/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/jetty-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/jetty/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/jmx-remoting/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/mail/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/management/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/naming-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/security-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/service-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/system/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/test-ddbean/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/timer/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/transaction/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/upgrade/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/web-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/pom.xml

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jul  5 15:05:45 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419112
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419353

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-core/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-core/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-core/pom.xml Wed Jul  5 15:05:45 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>
@@ -28,17 +32,20 @@
     </parent>
 
     <artifactId>geronimo-console-core</artifactId>
-    <name>Geronimo :: Console :: Common Code</name>
+    <name>Geronimo Applications, Console :: Core</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j-remote</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -70,11 +77,11 @@
                                 <touch file="${gen.file.name}" mkdirs="true"/>
                                 <echo file="${gen.file.name}">
 ##### Generated by Maven2 ####
-version=${geronimoVersion}
+version=${pom.version}
 build.date=${build.date}
 build.time=${build.time}
 copyright=Copyright (C) 2003-${build.year}, The Apache Software Foundation
-geronimo.build.version=${geronimoVersion}
+geronimo.build.version=${pom.version}
 geronimo.spec.version=${geronimoSpecJmsVersion}
 portal.core.version=${plutoVersion}
                 </echo>

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml Wed Jul  5 15:05:45 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,60 +33,22 @@
 
     <artifactId>geronimo-console</artifactId>
     <packaging>ear</packaging>
-    <name>Geronimo :: Console :: Application EAR</name>
+    <name>Geronimo Applications, Console :: EAR</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-framework</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>war</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-standard</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>war</type>
         </dependency>
-    <!-- dependency>
-      <groupId>org.apache.geronimo.applications.console</groupId>
-      <artifactId>geronimo-console-core</artifactId>
-      <version>${geronimoVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>${portletApiVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pluto</groupId>
-      <artifactId>pluto</artifactId>
-      <version>${plutoVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>activeio</groupId>
-      <artifactId>activeio</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.modules</groupId>
-      <artifactId>geronimo-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.modules</groupId>
-      <artifactId>geronimo-system</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.modules</groupId>
-      <artifactId>geronimo-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.modules</groupId>
-      <artifactId>geronimo-management</artifactId>
-    </dependency -->
     </dependencies>
 
     <build>

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/pom.xml Wed Jul  5 15:05:45 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>
@@ -28,35 +32,56 @@
     </parent>
 
     <artifactId>geronimo-console-framework</artifactId>
+    <name>Geronimo Applications, Console :: Portal Framework</name>
     <packaging>war</packaging>
-    <name>Geronimo :: Console :: Portal Framework</name>
-
+    
     <dependencies>
         <dependency>
             <groupId>castor</groupId>
             <artifactId>castor</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto</artifactId>
-            <version>${plutoVersion}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-portal</artifactId>
-            <version>${plutoVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-descriptors</artifactId>
-            <version>${plutoVersion}</version>
+        </dependency>
+        
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/pom.xml Wed Jul  5 15:05:45 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,100 +33,127 @@
 
     <artifactId>geronimo-console-standard</artifactId>
     <packaging>war</packaging>
-    <name>Geronimo :: Console :: Standard Portlets</name>
+    <name>Geronimo Applications, Console :: Standard Portlets</name>
 
     <dependencies>
+        
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.4_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.applications.console</groupId>
-            <artifactId>geronimo-console-core</artifactId>
-            <version>${geronimoVersion}</version>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-upgrade</artifactId>
+            <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-converter</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-derby</artifactId>
+            <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.applications.console</groupId>
+            <artifactId>geronimo-console-core</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>castor</groupId>
+            <artifactId>castor</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
-            <version>${commonsDigesterVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>${commonsFileuploadVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commonsIoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-upgrade</artifactId>
-            <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto</artifactId>
-            <version>${plutoVersion}</version>
         </dependency>
         
         <!-- JMS dependencies -->
+        
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <version>${activeMqVersion}</version>
             <scope>provided</scope>
         </dependency>
         
         <!-- Used to pre compile JSPs -->
+        
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
-            <version>${standardTaglibsVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>${jstlVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>dwr</groupId>
             <artifactId>dwr</artifactId>
-            <version>${dwrVersion}</version>
+        </dependency>
+        
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
         </dependency>
     </dependencies>
-
+    
     <build>
         <resources>
             <resource>
-                <directory>${basedir}/src/conf</directory>
+                <directory>${pom.basedir}/src/conf</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
-
+        
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml Wed Jul  5 15:05:45 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>
@@ -30,16 +34,15 @@
     <groupId>org.apache.geronimo.applications.console</groupId>
     <artifactId>console-parent</artifactId>
     <packaging>pom</packaging>
-    <name>Geronimo Console Application</name>
-    <description>Geronimo Console Application</description>
+    <name>Geronimo Applications :: Console</name>
 
     <dependencies>
         <dependency>
             <groupId>portlet-api</groupId>
             <artifactId>portlet-api</artifactId>
-            <version>${portletApiVersion}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jsp_2.0_spec</artifactId>

Modified: geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml Wed Jul  5 15:05:45 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,7 +33,28 @@
 
     <artifactId>demo</artifactId>
     <packaging>war</packaging>
-    <name>Geronimo Demo Application</name>
-    <description>Geronimo Demo Application</description>
-
+    <name>Geronimo Applications :: Demo</name>
+    
+    <dependencies>
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml Wed Jul  5 15:05:45 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,10 +33,32 @@
 
     <artifactId>geronimo-ldap-demo</artifactId>
     <packaging>war</packaging>
-    <name>Geronimo LDAP Demo Application</name>
+    <name>Geronimo Applications :: LDAP Demo</name>
     <description>
         This is a very simple application that is intended to demonstrate the ldap
         security mechanism.
     </description>
+    
+    <dependencies>
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-client/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-client/pom.xml Wed Jul  5 15:05:45 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,13 +33,13 @@
 
     <artifactId>magicGball-client</artifactId>
     <packaging>jar</packaging>
-    <name>Geronimo :: The Magic G Ball Sample :: Client</name>
+    <name>Geronimo Applications, The Magic G Ball :: Client</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-ejb</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml Wed Jul  5 15:05:45 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,23 +33,25 @@
 
     <artifactId>magicGball-ear</artifactId>
     <packaging>ear</packaging>
-    <name>Geronimo :: The Magic G Ball Sample Application</name>
+    <name>Geronimo Applications, The Magic G Ball :: EAR</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-client</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-ejb</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-web</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>${pom.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml Wed Jul  5 15:05:45 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,6 +33,6 @@
     
     <artifactId>magicGball-ejb</artifactId>
     <packaging>ejb</packaging>
-    <name>Geronimo :: The Magic G Ball Sample :: EJB</name>
+    <name>Geronimo Applications, The Magic G Ball :: EJB</name>
 
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml Wed Jul  5 15:05:45 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,14 +33,35 @@
 
     <artifactId>magicGball-web</artifactId>
     <packaging>war</packaging>
-    <name>Geronimo :: The Magic G Ball Sample :: WAR</name>
+    <name>Geronimo Applications, The Magic G Ball :: WAR</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-ejb</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
+

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml Wed Jul  5 15:05:45 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>
@@ -30,7 +34,7 @@
     <groupId>org.apache.geronimo.applications.magicGball</groupId>
     <artifactId>magicGball-parent</artifactId>
     <packaging>pom</packaging>
-    <name>Geronimo :: The Magic G Ball </name>
+    <name>Geronimo Applications :: The Magic G Ball</name>
 
     <dependencies>
         <dependency>
@@ -38,32 +42,30 @@
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jsp_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-qname_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_2.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-    <!--dependency>
-      <groupId>org.apache.geronimo.plugins</groupId>
-      <artifactId>geronimo-deployment-plugin</artifactId>
-      <version>${geronimoVersion}</version>
-      <scope>provided</scope>
-    </dependency-->
     </dependencies>
 
     <modules>

Modified: geronimo/sandbox/svkmerge/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/pom.xml Wed Jul  5 15:05:45 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,48 +33,9 @@
 
     <groupId>org.apache.geronimo.applications</groupId>
     <artifactId>applications-parent</artifactId>
+    <name>Geronimo :: Applications</name>
     <packaging>pom</packaging>
-    <name>Geronimo Applications</name>
-    <description>Geronimo Applications</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
-                    <archiveClasses>true</archiveClasses>
-                    <webXml>${basedir}/target/jspweb.xml</webXml>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jspc-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>jspc</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
-                            <inputWebXml>${basedir}/src/webapp/WEB-INF/web.xml</inputWebXml>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jasper-runtime</artifactId>
-            <version>${jasperVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
+    
     <modules>
         <module>demo</module>
         <module>ldap-realm-demo</module>
@@ -81,4 +46,16 @@
         <module>console</module>
         <module>welcome</module>
     </modules>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+                <version>${tomcatVersion}</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/pom.xml Wed Jul  5 15:05:45 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,7 +33,7 @@
 
     <artifactId>geronimo-remote-deploy</artifactId>
     <packaging>war</packaging>
-    <name>Geronimo Remote Deploy Application</name>
+    <name>Geronimo Applications :: Remote Deploy</name>
     <description>
         This application is essentially a servlet that accepts file upload
         requests from remote clients, which is necessary for remote
@@ -46,8 +50,28 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
     
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/uddi-db/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/uddi-db/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/uddi-db/pom.xml Wed Jul  5 15:05:45 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>
@@ -28,14 +32,33 @@
     </parent>
 
     <artifactId>geronimo-uddi-db</artifactId>
-    <name>Geronimo UDDI Server Database</name>
-    <description>Geronimo UDDI Server Database</description>
-
+    <name>Geronimo Applications :: UDDI Server Database</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>juddi</groupId>
+            <artifactId>juddi</artifactId>
+            <version>${juddiVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+        </dependency>
+    </dependencies>
+    
     <build>
         <resources>
             <resource>
-        <!-- ${project.build.directory} doesn't work in the following line. -->
-                <directory>${basedir}/target/resources</directory>
+                <directory>${pom.basedir}/target/resources</directory>
             </resource>
         </resources>
 
@@ -49,15 +72,32 @@
                             <tasks>
                                 <property name="derby.system.home" value="${project.build.directory}/resources/META-INF/${pom.artifactId}/var/derby"/>
                                 <property name="derby.storage.fileSyncTransactionLog" value="true"/>
+                                
                                 <delete dir="${derby.system.home}"/>
                                 <mkdir dir="${derby.system.home}"/>
+                                
                                 <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
-                                        url="jdbc:derby:${derby.system.home}/UddiDatabase;create=true"
-                                        userid="" password="" autocommit="true" onerror="abort" delimiter=";">
-                                    <fileset dir="src/sql"/>
+                                    url="jdbc:derby:${derby.system.home}/UddiDatabase;create=true"
+                                    userid=""
+                                    password=""
+                                    autocommit="true"
+                                    onerror="continue"
+                                    delimiter=";">
+                                    
+                                    <fileset dir="${pom.basedir}/src/sql"/>
+                                    
+                                    <!--
+                                    
+                                    NOTE: Due to a rather annonying bug with antrun which does not
+                                          pick up plugin dependencies properly when run from the reactor
+                                          we have to go around the broken dependency system and reference
+                                          the artifact directly.
+                                    
+                                    <classpath refid="maven.plugin.classpath"/>
+                                    -->
                                     <classpath>
                                         <fileset dir="${settings.localRepository}/org/apache/derby/derby/${derbyVersion}">
-                                            <include name="**/derby-${derbyVersion}.jar" />
+                                            <include name="derby-${derbyVersion}.jar" />
                                         </fileset>
                                     </classpath>
                                 </sql>
@@ -68,6 +108,25 @@
                         </goals>
                     </execution>
                 </executions>
+                
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.derby</groupId>
+                        <artifactId>derby</artifactId>
+                        <!-- HACK: For some reason this is not picked up from dependencyManagement -->
+                        <version>${derbyVersion}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/sandbox/svkmerge/trunk/applications/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/uddi-server/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/uddi-server/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/uddi-server/pom.xml Wed Jul  5 15:05:45 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,21 +33,41 @@
 
     <artifactId>geronimo-uddi-server</artifactId>
     <packaging>war</packaging>
-    <name>Geronimo UDDI Server</name>
-    <description>Geronimo UDDI Server</description>
-
+    <name>Geronimo Applications :: UDDI Server</name>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>juddi</groupId>
             <artifactId>juddi</artifactId>
             <version>${juddiVersion}</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+        </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml Wed Jul  5 15:05:45 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,7 +33,7 @@
 
     <artifactId>geronimo-welcome</artifactId>
     <packaging>war</packaging>
-    <name>Geronimo Welcome Application</name>
+    <name>Geronimo Applications :: Welcome</name>
     <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
@@ -40,18 +44,42 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Required for JSPC compilation -->
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+        </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Added: geronimo/sandbox/svkmerge/trunk/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/bootstrap?rev=419355&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/bootstrap (added)
+++ geronimo/sandbox/svkmerge/trunk/bootstrap Wed Jul  5 15:05:45 2006
@@ -0,0 +1,58 @@
+#!/bin/sh
+##
+## $Id$
+##
+
+clean() {
+    echo "Cleaning..."
+    
+    rm -rf ~/.m2/repository
+    
+    find . -name target -type d -exec rm -rf \{\} \;
+}
+
+stage() {
+    echo "Starting stage: $1"
+    
+    mvn -Dstage=$1
+}
+
+thirdparty() {
+    # Build thirdparty components
+    echo "Building thirdparty..."
+    
+    rm -rf thirdparty
+    mkdir -p thirdparty
+    (
+        cd thirdparty
+        
+        # Build TranQL
+        echo "Building TranQL..."
+        
+        svn co https://svn.codehaus.org/tranql/trunk tranql
+        (
+            cd tranql
+            mvn -Dmaven.test.skip=true install
+        )
+        
+        # Build OpenEJB
+        echo "Building OpenEJB..."
+        
+        svn co https://svn.codehaus.org/openejb/trunk/openejb2 openejb2
+        (
+            cd openejb2
+            mvn -Dmaven.test.skip=true install
+        )
+    )
+}
+
+clean
+
+stage bootstrap
+
+thirdparty
+
+stage assemble
+
+echo "Done"
+

Propchange: geronimo/sandbox/svkmerge/trunk/bootstrap
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/sandbox/svkmerge/trunk/build
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/build?rev=419355&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/build (added)
+++ geronimo/sandbox/svkmerge/trunk/build Wed Jul  5 15:05:45 2006
@@ -0,0 +1,50 @@
+#!/bin/sh
+##
+## $Id$
+##
+
+PROGNAME=`basename "$0"`
+DIRNAME=`dirname "$0"`
+
+warn() {
+    echo "${PROGNAME}: $*"
+}
+
+die() {
+    warn "$*"
+    exit 1
+}
+
+now() {
+    date +'%H:%M:%S %Z %Y'
+}
+
+begin() {
+    warn "Starting multi-stage build..."
+}
+
+abort() {
+    die "Aborted ($startdate to `now`)"
+}
+
+complete() {
+    if [ "$1" == "0" ]; then
+        warn "Completed ($startdate to `now`)"
+    else
+        die "Failed ($startdate to `now`)"
+    fi
+}
+
+startdate=`now`
+
+trap abort STOP KILL INT ABRT
+
+(
+    begin && (
+        mvn -Dstage=bootstrap "$@" && \
+        mvn -Dstage=assemble "$@"
+    ) && complete $?
+)
+
+exit 0
+

Added: geronimo/sandbox/svkmerge/trunk/build.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/build.bat?rev=419355&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/build.bat (added)
+++ geronimo/sandbox/svkmerge/trunk/build.bat Wed Jul  5 15:05:45 2006
@@ -0,0 +1,43 @@
+@if "%DEBUG%" == "" @echo off
+@rem 
+@rem $Id$
+@rem 
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%eval[2+2]" == "4" goto 4NT_args
+
+@rem Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto execute
+
+:win9xME_args
+@rem Slurp the command line arguments.  This loop allows for an unlimited number
+set CMD_LINE_ARGS=
+
+:win9xME_args_slurp
+if "x%1" == "x" goto execute
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto win9xME_args_slurp
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+
+mvn -Dstage=bootstrap %CMD_LINE_ARGS%
+mvn -Dstage=assemble %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" endlocal
+
+@rem Optional pause the batch file
+if "%DBCOPY_BATCH_PAUSE%" == "on" pause
+

Propchange: geronimo/sandbox/svkmerge/trunk/build.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: geronimo/sandbox/svkmerge/trunk/build.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/svkmerge/trunk/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/activemq-broker/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/activemq-broker/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/activemq-broker/pom.xml Wed Jul  5 15:05:45 2006
@@ -16,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,53 +27,35 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>activemq-broker</artifactId>
+    <name>Geronimo Configs :: ActiveMQ Broker</name>
     <packaging>car</packaging>
-    <name>ActiveMQ Broker Configuration</name>
-
-    <build>
-        <plugins>
-            <!-- This plugin needed to support package type car -->
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
-                <!-- uses default geronimo-gbean-deployer -->                  
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
+    
     <dependencies>
+        
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <version>${activeMqVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-gbean-g1_1</artifactId>
-            <version>${activeMqVersion}</version>
         </dependency>
        
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-gbean-management-g1_1</artifactId>
-            <version>${activeMqVersion}</version>
         </dependency>
-        <!-- removed activeio -->
+        
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml Wed Jul  5 15:05:45 2006
@@ -16,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,54 +27,48 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>activemq</artifactId>
+    <name>Geronimo Configs :: ActiveMQ</name>
     <packaging>car</packaging>
-    <name>Activemq Configuration</name>
-
-    <build>
-        <plugins>
-            <!-- This plugin needed to support package type car -->
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <deploymentConfig>${j2eeNowebServer}</deploymentConfig>  <!-- no web deployer -->
-                   <moduleFile>${settings.localRepository}/org/apache/geronimo/modules/ge-activemq-rar/${geronimoVersion}/ge-activemq-rar-${geronimoVersion}.rar</moduleFile> 
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-  
-    <properties>
-        <PlanServerHostname>localhost</PlanServerHostname>
-        <PlanActiveMQPort>61616</PlanActiveMQPort>
-    </properties>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
+    
     <dependencies>
+        
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <!-- To enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>ge-activemq-rar</artifactId>
+            <version>${pom.version}</version>
             <type>rar</type>
         </dependency>
 
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${j2eeNowebServer}</deploymentConfig>  <!-- no web deployer -->
+                   <moduleFile>${settings.localRepository}/org/apache/geronimo/modules/ge-activemq-rar/${pom.version}/ge-activemq-rar-${pom.version}.rar</moduleFile> 
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+  
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,69 +28,35 @@
     </parent>
 
     <artifactId>axis-deployer</artifactId>
+    <name>Geronimo Configs :: Axis Deployer</name>
     <packaging>car</packaging>
-    <name>Axis Configuration for performing J2EE deployments</name>
     
-    <build>
-        <plugins>
-            <plugin>
-                <!-- uses geronimo-gbean-deployer -->
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
     <dependencies>
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
-        </dependency>
-        <!-- this should get openejb-core -->
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-pkgen-builder</artifactId>
-            <version>${openejbVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <version>${openejbVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>tranql</groupId>
-            <artifactId>tranql</artifactId>
-            <version>${tranqlVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml Wed Jul  5 15:05:45 2006
@@ -16,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
     
@@ -27,36 +28,23 @@
     </parent>
 
     <artifactId>axis</artifactId>
+    <name>Geronimo Configs :: Axis</name>
     <packaging>car</packaging>
-    <name>Axis Configuration for the J2EE Server</name>
     
-    <build>
-        <plugins>
-            <plugin>
-                <!-- uses geronimo-gbean-deployer -->
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
     <dependencies>
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,48 +27,17 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>client-corba</artifactId>
+    <name>Geronimo Configs :: Corba J2EE Client</name>
     <packaging>car</packaging>
-    <name>Corba Configuration for the J2EE Client</name>
-
-    <properties>
-        <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
-        <PlanCOSNamingPort>1050</PlanCOSNamingPort>
-        <PlanORBSSLHost>localhost</PlanORBSSLHost>
-        <PlanORBSSLPort>2001</PlanORBSSLPort>
-        <PlanHTTPPort>8080</PlanHTTPPort>
-        <PlanHTTPSPort>8443</PlanHTTPSPort>
-        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
-        <PlanServerHostname>localhost</PlanServerHostname>
-        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
-        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
-    </properties>
     
-    <build>
-        <plugins>
-            <!-- This plugin needed to support package type car -->
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>            
-                 </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
     <dependencies>
+        
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
@@ -76,16 +45,29 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
 
         <!-- needed by GBean, this was not a dep in M1-->
         <dependency>
-            <groupId>openejb</groupId>
+            <groupId>org.openejb</groupId>
             <artifactId>openejb-core</artifactId>
-            <version>${openejbVersion}</version>
-        </dependency> 
+        </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>            
+                 </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client-corba/src/plan/plan.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client-corba/src/plan/plan.xml Wed Jul  5 15:05:45 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     Copyright 2004-2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,6 @@
 
 <!-- $Rev$ $Date$ -->
 
-<!--
-CSSBean examples for app client
--->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
     <gbean name="CORBASystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
         <attribute name="systemProperties">
@@ -36,7 +32,6 @@
             javax.net.ssl.keyStore=var/security/keystores/geronimo-default
             javax.net.ssl.trustStore=var/security/keystores/geronimo-default
         </attribute>
-
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
@@ -61,7 +56,8 @@
             <name>CORBASystemProperties</name>
         </dependency>
     </gbean>
-<!-- a few sample css beans for the app client -->
+    
+    <!-- a few sample css beans for the app client -->
     <!--
     <gbean name="SSLClientCert" class="org.openejb.corba.CSSBeanGBean">
         <reference name="ThreadPool">

Modified: geronimo/sandbox/svkmerge/trunk/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client-deployer/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client-deployer/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,32 +27,16 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>client-deployer</artifactId>
+    <name>Geronimo Configs :: Application Client Deployments</name>
     <packaging>car</packaging>
-    <name>Configuration for Application Client Deployments</name>
     
-    <build>
-        <plugins>
-            <plugin>
-                <!-- uses geronimo-gbean-deployer -->
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
     <dependencies>
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
@@ -66,84 +50,82 @@
         <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-transaction</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- this will get g-j2ee-schema -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- transitive -->
+        
         <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-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- transitive -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</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-connector-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- transitive -->
+        
         <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-web-builder</artifactId>
-        </dependency>       
-
-        <!-- this should get openejb-core -->
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-pkgen-builder</artifactId>
-            <version>${openejbVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <version>${openejbVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>tranql</groupId>
-            <artifactId>tranql</artifactId>
-            <version>${tranqlVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client-security/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client-security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client-security/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,70 +27,60 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>client-security</artifactId>
+    <name>Geronimo Configs :: J2EE Client Security</name>
     <packaging>car</packaging>
-    <name>Security Configuration for the J2EE Client</name>
-
-    <properties>
-        <PlanHTTPPort>8080</PlanHTTPPort>
-        <PlanHTTPSPort>8443</PlanHTTPSPort>
-        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
-        <PlanServerHostname>localhost</PlanServerHostname>
-        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
-        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <!-- uses geronimo-gbean-deployer -->
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
+    
     <dependencies>
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <!-- This is needed to make sure j2ee-deployer was built before -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <!-- not needed in m1 -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <!--
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jmx-remoting</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         -->
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client-system/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client-system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client-system/pom.xml Wed Jul  5 15:05:45 2006
@@ -29,23 +29,50 @@
     </parent>
 
     <artifactId>client-system</artifactId>
+    <name>Geronimo Configs :: Client System</name>
     <packaging>car</packaging>
-    <name>System Configuration for the J2EE Client</name>
+    
+    <dependencies>
 
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- To Do - are the deps of g-system needed in the plan.xml ? -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- need qname_spec ? -->
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>                
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
                 <configuration>
                     <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
                     <!-- written to Manifest.mf -->
                     <classPath>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \
-                        ../lib/geronimo-common-${geronimoVersion}.jar \
-                        ../lib/geronimo-kernel-${geronimoVersion}.jar \
-                        ../lib/geronimo-system-${geronimoVersion}.jar \
-                        ../lib/geronimo-util-${geronimoVersion}.jar \
+                        ../lib/geronimo-common-${pom.version}.jar \
+                        ../lib/geronimo-kernel-${pom.version}.jar \
+                        ../lib/geronimo-system-${pom.version}.jar \
+                        ../lib/geronimo-util-${pom.version}.jar \
                         ../lib/cglib-nodep-${cglibVersion}.jar \
                         ../lib/commons-cli-${commonsCliVersion}.jar \
                         ../lib/commons-logging-${commonsLoggingVersion}.jar \
@@ -63,35 +90,4 @@
         </plugins>
     </build>
 
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-        </dependency>
-        
-        <!-- To Do - are the deps of g-system needed in the plan.xml ? -->
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-system</artifactId>
-        </dependency>
-        
-        <!-- need qname_spec ? -->
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xercesVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
-            <version>${xmlParserApisVersion}</version>
-        </dependency>
-
-    </dependencies>
 </project>



Mime
View raw message