geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428856 [1/12] - in /geronimo/sandbox/svkmerge/trunk: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-framework...
Date Fri, 04 Aug 2006 19:44:34 GMT
Author: jdillon
Date: Fri Aug  4 12:44:18 2006
New Revision: 428856

URL: http://svn.apache.org/viewvc?rev=428856&view=rev
Log:
(GERONIMO-2219) Merge m2migration to trunk (pre-merge to svkmerge/trunk)

Added:
    geronimo/sandbox/svkmerge/trunk/configs/remote-deploy-jetty/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/configs/remote-deploy-tomcat/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/configs/uddi-jetty/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/LICENSE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/NOTICE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/README.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/client-log4j.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/log/server-log4j.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_groups.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/demo_users.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/groups.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/keystores/geronimo-default   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/security/users.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/classes/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/shared/lib/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/temp/README.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/LICENSE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/NOTICE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/README.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_groups.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/demo_users.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/groups.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/keystores/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/keystores/geronimo-default   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/security/users.properties   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/classes/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/shared/lib/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/var/temp/README.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/LICENSE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/NOTICE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/offline-deployer-list
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/LICENSE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/NOTICE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/src/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/offline-deployer-list
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/LICENSE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/NOTICE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/offline-deployer-list
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/LICENSE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/NOTICE.txt   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/src/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/offline-deployer-list
    geronimo/sandbox/svkmerge/trunk/m2-assemblies/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/resources/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/resources/META-INF/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/site/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/site/apt/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/site/apt/usage.apt
    geronimo/sandbox/svkmerge/trunk/m2-plugins/car-maven-plugin/src/site/site.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/pom.xml   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/DistributeModuleMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java   (with props)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java   (with props)
Removed:
    geronimo/sandbox/svkmerge/trunk/applications/uddi-db/src/webapp/
    geronimo/sandbox/svkmerge/trunk/m2-plugins/geronimo-packaging-plugin/
    geronimo/sandbox/svkmerge/trunk/modules/axis/log4j.properties
    geronimo/sandbox/svkmerge/trunk/modules/security/log4j.properties
    geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/resources2/
    geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/var/
Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/   (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-framework/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    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/maven.xml   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/   (props changed)
    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/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml
    geronimo/sandbox/svkmerge/trunk/applications/welcome/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/sampleNotInstalled.jsp
    geronimo/sandbox/svkmerge/trunk/assemblies/   (props changed)
    geronimo/sandbox/svkmerge/trunk/bootstrap
    geronimo/sandbox/svkmerge/trunk/build
    geronimo/sandbox/svkmerge/trunk/configs/   (props changed)
    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-deployer/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/client-deployer/project.xml   (props changed)
    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/jsp-examples-tomcat/project.xml   (props changed)
    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-deployer/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/configs/tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/configs/uddi-jetty/src/plan/plan.xml
    geronimo/sandbox/svkmerge/trunk/configs/uddi-tomcat/src/plan/plan.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/etc/   (props changed)
    geronimo/sandbox/svkmerge/trunk/m2-plugins/pom.xml   (contents, props changed)
    geronimo/sandbox/svkmerge/trunk/modules/activation/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-builder/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java/   (props changed)
    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/common/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/connector-builder/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/connector-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/connector/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/console-web/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/converter/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/core/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/deploy-config/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/deployment/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/deployment/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
    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-processing/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/installer-support/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/interceptor/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-schema/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
    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/jetty/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
    geronimo/sandbox/svkmerge/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
    geronimo/sandbox/svkmerge/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
    geronimo/sandbox/svkmerge/trunk/modules/jmx-remoting/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/kernel/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/kernel/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java
    geronimo/sandbox/svkmerge/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java
    geronimo/sandbox/svkmerge/trunk/modules/mail/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/management/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/management/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/naming-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/naming-builder/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/naming/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/scripts/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/security-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/security/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/security/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
    geronimo/sandbox/svkmerge/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
    geronimo/sandbox/svkmerge/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
    geronimo/sandbox/svkmerge/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
    geronimo/sandbox/svkmerge/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
    geronimo/sandbox/svkmerge/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
    geronimo/sandbox/svkmerge/trunk/modules/service-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/service-builder/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
    geronimo/sandbox/svkmerge/trunk/modules/system/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/system/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerConstants.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/ConfigurationStoreUtilTest.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/ServerOverrideTest.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java
    geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java
    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-builder/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/sandbox/svkmerge/trunk/modules/tomcat/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
    geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
    geronimo/sandbox/svkmerge/trunk/modules/transaction/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java
    geronimo/sandbox/svkmerge/trunk/modules/upgrade/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/util/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/web-builder/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/web-builder/pom.xml
    geronimo/sandbox/svkmerge/trunk/modules/web-builder/src/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
    geronimo/sandbox/svkmerge/trunk/modules/webservices/pom.xml
    geronimo/sandbox/svkmerge/trunk/pom.xml   (contents, props changed)

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -1,2 +1,2 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:428851
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:428843

Propchange: geronimo/sandbox/svkmerge/trunk/applications/console/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console:421368

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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-core/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-core/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,23 +17,34 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-console-core</artifactId>
     <name>Geronimo Applications, Console :: Core</name>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-core</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-core</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-core</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -53,13 +64,6 @@
     </dependencies>
 
     <build>
-    <!-- resources>
-      <resource>
-        <directory>${basedir}/src/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources -->
-    <!-- use the antrun plugin till we get timestamp plugin from Geronimo-1659 -->
         <plugins>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-ear/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,24 +17,35 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-console</artifactId>
-    <packaging>ear</packaging>
     <name>Geronimo Applications, Console :: EAR</name>
-
+    <packaging>ear</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
@@ -65,11 +76,13 @@
                             <groupId>org.apache.geronimo.applications.console</groupId>
                             <artifactId>geronimo-console-framework</artifactId>
                             <contextRoot>/console</contextRoot>
+                            <bundleFileName>framework.war</bundleFileName>
                         </webModule>
                         <webModule>
                             <groupId>org.apache.geronimo.applications.console</groupId>
                             <artifactId>geronimo-console-standard</artifactId>
                             <contextRoot>/console-standard</contextRoot>
+                            <bundleFileName>standard.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,16 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -34,6 +31,20 @@
     <artifactId>geronimo-console-framework</artifactId>
     <name>Geronimo Applications, Console :: Portal Framework</name>
     <packaging>war</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework</url>
+    </scm>
     
     <dependencies>
         <dependency>

Propchange: geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/src:427994

Propchange: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard:423294

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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,24 +17,35 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console-parent</artifactId>
+        <artifactId>console</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-console-standard</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications, Console :: Standard Portlets</name>
-
+    <packaging>war</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard</url>
+    </scm>
+    
     <dependencies>
         
         <dependency>
@@ -132,6 +143,15 @@
     
     <build>
         <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
             <resource>
                 <directory>${pom.basedir}/src/conf</directory>
                 <filtering>true</filtering>

Propchange: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:427999

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
    (empty)

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
    (empty)

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,22 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.applications.console</groupId>
-    <artifactId>console-parent</artifactId>
+    <artifactId>console</artifactId>
     <packaging>pom</packaging>
     <name>Geronimo Applications :: Console</name>
 

Modified: geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/demo/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,23 +17,20 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>demo</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Demo</name>
+    <packaging>war</packaging>
     
     <dependencies>
         <!-- Required for JSPC compilation -->

Modified: geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/ldap-realm-demo/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,27 +17,39 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-ldap-demo</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: LDAP Demo</name>
+    <packaging>war</packaging>
+    
     <description>
         This is a very simple application that is intended to demonstrate the ldap
         security mechanism.
     </description>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/ldap-realm-demo</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/ldap-realm-demo</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/ldap-realm-demo</url>
+    </scm>
     
     <dependencies>
         <!-- Required for JSPC compilation -->

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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-client/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,10 +17,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,11 +25,10 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-client</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo Applications, The Magic G Ball :: Client</name>
 
     <dependencies>

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ear/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,10 +17,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,13 +25,13 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-ear</artifactId>
-    <packaging>ear</packaging>
     <name>Geronimo Applications, The Magic G Ball :: EAR</name>
-
+    <packaging>ear</packaging>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-ejb/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,10 +17,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,11 +25,11 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
     
     <artifactId>magicGball-ejb</artifactId>
-    <packaging>ejb</packaging>
     <name>Geronimo Applications, The Magic G Ball :: EJB</name>
-
+    <packaging>ejb</packaging>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/magicGball-web/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,10 +17,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,13 +25,13 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-web</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications, The Magic G Ball :: WAR</name>
-
+    <packaging>war</packaging>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>

Propchange: geronimo/sandbox/svkmerge/trunk/applications/magicGball/maven.xml
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/magicGball/maven.xml:424119

Modified: geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/magicGball/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,24 +17,21 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.applications.magicGball</groupId>
-    <artifactId>magicGball-parent</artifactId>
-    <packaging>pom</packaging>
+    <artifactId>magicGball</artifactId>
     <name>Geronimo Applications :: The Magic G Ball</name>
+    <packaging>pom</packaging>
 
     <dependencies>
         <dependency>

Modified: geronimo/sandbox/svkmerge/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,22 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo</groupId>
-        <artifactId>geronimo-parent</artifactId>
+        <artifactId>geronimo</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.applications</groupId>
-    <artifactId>applications-parent</artifactId>
+    <artifactId>applications</artifactId>
     <name>Geronimo :: Applications</name>
     <packaging>pom</packaging>
     

Propchange: geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/remote-deploy:423550

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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,29 +17,41 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-remote-deploy</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Remote Deploy</name>
+    <packaging>war</packaging>
+    
     <description>
         This application is essentially a servlet that accepts file upload
         requests from remote clients, which is necessary for remote
         deployment operations to work properly.
     </description>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/remote-deploy</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/remote-deploy</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/remote-deploy</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/uddi-db/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/uddi-db/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,16 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -34,80 +31,50 @@
     <artifactId>geronimo-uddi-db</artifactId>
     <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>
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/uddi-db</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/uddi-db</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/uddi-db</url>
+    </scm>
+    
+    <properties>
+        <derby.system.home>${project.build.directory}/classes/META-INF/${pom.artifactId}/var/derby</derby.system.home>
+    </properties>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/target/resources</directory>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>prepare-db</id>
                         <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             <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="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" />
-                                        </fileset>
-                                    </classpath>
-                                </sql>
                             </tasks>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
                 </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>sql-maven-plugin</artifactId>
+                <version>1.0-beta-1-SNAPSHOT</version>
                 
                 <dependencies>
                     <dependency>
@@ -117,16 +84,26 @@
                         <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>
+                
+                <executions>
+                    <execution>
+                        <id>create-db</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+                            <url>jdbc:derby:${derby.system.home}/UddiDatabase;create=true</url>
+                            <autocommit>true</autocommit>
+                            <onError>continue</onError>
+                            <delimiter>;</delimiter>
+                            <srcFiles>
+                                <srcFile>${pom.basedir}/src/sql/juddi.sql</srcFile>
+                            </srcFiles>
+                        </configuration>
+                    </execution>
+                </executions>
             </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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/uddi-server/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/uddi-server/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,25 +17,37 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-uddi-server</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: UDDI Server</name>
+    <packaging>war</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/uddi-server</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/uddi-server</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/uddi-server</url>
+    </scm>
     
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
@@ -45,7 +57,6 @@
         <dependency>
             <groupId>juddi</groupId>
             <artifactId>juddi</artifactId>
-            <version>${juddiVersion}</version>
             <scope>provided</scope>
         </dependency>
         
@@ -54,6 +65,7 @@
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
         </dependency>
+        
     </dependencies>
     
     <build>

Propchange: geronimo/sandbox/svkmerge/trunk/applications/welcome/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/welcome:423294

Modified: geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/welcome/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,29 +17,41 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-welcome</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Welcome</name>
+    <packaging>war</packaging>
+    
     <description>
         This is a very simple application that is intended to serve as the default page
         that can be viewed when the server is first installed so that someone can see
         that the installation is working.
     </description>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/welcome</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/welcome</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/welcome</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Propchange: geronimo/sandbox/svkmerge/trunk/applications/welcome/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/welcome/src:426500

Modified: geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/sampleNotInstalled.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/sampleNotInstalled.jsp?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/sampleNotInstalled.jsp (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/sampleNotInstalled.jsp Fri Aug  4 12:44:18 2006
@@ -23,7 +23,7 @@
     <link rel="stylesheet" href="/main.css" type="text/css"/>
 </head>
 
-<body>
+<body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" rightmargin="0">
 
 <!-- Header -->
 <table width="100%">

Propchange: geronimo/sandbox/svkmerge/trunk/assemblies/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/assemblies:423294

Modified: geronimo/sandbox/svkmerge/trunk/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/bootstrap?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/bootstrap (original)
+++ geronimo/sandbox/svkmerge/trunk/bootstrap Fri Aug  4 12:44:18 2006
@@ -3,56 +3,96 @@
 ## $Id$
 ##
 
+PROGNAME=`basename "$0"`
+DIRNAME=`dirname "$0"`
+
+warn() {
+    echo "${PROGNAME}: $*"
+}
+
+die() {
+    warn "$*"
+    exit 1
+}
+
+now() {
+    date +'%H:%M:%S %Z %Y'
+}
+
+begin() {
+    warn "Starting bootstrap build..."
+}
+
+abort() {
+    die "Aborted ($startdate to `now`)"
+}
+
+complete() {
+    if [ "$1" == "0" ]; then
+        warn "Completed ($startdate to `now`)"
+    else
+        die "Failed ($startdate to `now`)"
+    fi
+}
+
 clean() {
     echo "Cleaning..."
     
     rm -rf ~/.m2/repository
     
-    find . -name target -type d -exec rm -rf \{\} \;
+    rm -rf "$DIRNAME/thirdparty"
+    mkdir -p "$DIRNAME/thirdparty"
+    
+    for x in `find "$DIRNAME" -name target -type d`; do
+        rm -rf "$x"
+    done
 }
 
 stage() {
     echo "Starting stage: $1"
     
     mvn -Dstage=$1
+    
+    if [ "$?" != "0" ]; then
+        die "Bootstrap failed in stage $1"
+    fi
 }
 
-thirdparty() {
+openejb2() {
     # Build thirdparty components
-    echo "Building thirdparty..."
+    echo "Building OpenEJB2..."
     
-    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..."
+        cd "$DIRNAME/thirdparty"
         
-        svn co https://svn.codehaus.org/openejb/trunk/openejb2 openejb2
+        svn co http://svn.codehaus.org/openejb/trunk/openejb2 openejb2
         (
             cd openejb2
             mvn -Dmaven.test.skip=true install
+            
+            if [ "$?" != "0" ]; then
+                die "Bootstrap failed building OpenEJB"
+            fi
         )
     )
 }
 
-clean
-
-stage bootstrap
-
-thirdparty
-
-stage assemble
+main() {
+    startdate=`now`
+    
+    trap abort STOP KILL INT ABRT
+    
+    if [ "x$1" != "x" ]; then
+        $*
+    else
+        begin && (
+            clean
+            stage "bootstrap" && \
+            openejb2 && \
+            stage "assemble"
+        ) && complete $?
+    fi
+}
 
-echo "Done"
+main "$@" | 2>&1 tee bootstrap.log
 

Modified: geronimo/sandbox/svkmerge/trunk/build
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/build?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/build (original)
+++ geronimo/sandbox/svkmerge/trunk/build Fri Aug  4 12:44:18 2006
@@ -35,16 +35,20 @@
     fi
 }
 
-startdate=`now`
+main() {
+    startdate=`now`
+    
+    trap abort STOP KILL INT ABRT
+    
+    (
+        begin && (
+            mvn -Dstage=bootstrap "$@" && \
+            mvn -Dstage=assemble "$@"
+        ) && complete $?
+    )
+    
+    exit 0
+}
 
-trap abort STOP KILL INT ABRT
-
-(
-    begin && (
-        mvn -Dstage=bootstrap "$@" && \
-        mvn -Dstage=assemble "$@"
-    ) && complete $?
-)
-
-exit 0
+main "$@" | 2>&1 tee build.log
 

Propchange: geronimo/sandbox/svkmerge/trunk/configs/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/configs:422569

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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/activemq-broker/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/activemq-broker/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/activemq/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -62,9 +63,15 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeNowebServer}</deploymentConfig>  <!-- no web deployer -->
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                    <moduleFile>${settings.localRepository}/org/apache/geronimo/modules/ge-activemq-rar/${pom.version}/ge-activemq-rar-${pom.version}.rar</moduleFile> 
                 </configuration>
             </plugin>

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=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/axis-deployer/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/axis/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client-corba/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -62,9 +63,14 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>            
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                  </configuration>
             </plugin>
         </plugins>



Mime
View raw message