geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r885248 [1/2] - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty8-javaee6/ assemblies/geronimo-jetty8-minimal/ framework/ framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/ framework/buildsuppo...
Date Sun, 29 Nov 2009 17:27:06 GMT
Author: djencks
Date: Sun Nov 29 17:27:03 2009
New Revision: 885248

URL: http://svn.apache.org/viewvc?rev=885248&view=rev
Log:
GERONIMO-4566 port build changes from 2.2 to allow releasing with release plugin

Added:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/   (props changed)
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/startup-jar
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/plan/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/plan/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/validate.groovy
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/validate.groovy
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/   (props changed)
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/startup-jar
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/plan/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/plan/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/validate.groovy
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/validate.groovy
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/   (props changed)
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/validate.groovy
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/validate.groovy
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/   (props changed)
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/
      - copied from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/validate.groovy
      - copied unchanged from r832538, geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/validate.groovy
Removed:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/
Modified:
    geronimo/server/trunk/   (props changed)
    geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/   (props changed)
    geronimo/server/trunk/assemblies/geronimo-jetty8-minimal/   (props changed)
    geronimo/server/trunk/framework/   (props changed)
    geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-boilerplate/   (props changed)
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/   (props changed)
    geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml
    geronimo/server/trunk/plugins/activemq/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java   (props changed)
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java   (props changed)
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java   (props changed)
    geronimo/server/trunk/plugins/clustering/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-jetty/   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/filtered-resources/   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers.xml   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_bindings.xml   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_mixed.xml   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_port.xml   (props changed)
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_service.xml   (props changed)
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml
    geronimo/server/trunk/plugins/monitoring/pom.xml
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/   (props changed)
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties   (props changed)
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties   (props changed)
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/   (props changed)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/   (props changed)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/   (props changed)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/org/apache/geronimo/test/handlers.xml   (props changed)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java   (props changed)
    geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml

Propchange: geronimo/server/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /geronimo/server/branches/2.2:832538,885058

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty8-minimal/
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 29 17:27:03 2009
@@ -1,2 +1,2 @@
-/geronimo/server/branches/2.2/framework:826768
+/geronimo/server/branches/2.2/framework:826768,832538,885058
 /geronimo/server/trunk/framework:749113,749116-807432,809079-825588

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml Sun Nov 29 17:27:03 2009
@@ -7,7 +7,7 @@
     <packaging>application-assembly</packaging>
 
     <properties>
-        <!-- This property is required by the car:package mojo -->
+        <!-- This may be helpful in selecting the desired geronimo version -->
         <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
 
     </properties>

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml Sun Nov 29 17:27:03 2009
@@ -7,7 +7,9 @@
     <packaging>server-assembly</packaging>
 
     <properties>
+        <!-- This may be helpful in selecting the desired geronimo version -->
         <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
+
     </properties>
 
 

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Sun Nov 29 17:27:03 2009
@@ -7,7 +7,7 @@
     <packaging>car</packaging>
 
     <properties>
-        <!-- This property is required by the car:package mojo -->
+        <!-- This may be helpful in selecting the desired geronimo version -->
         <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
 
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Sun Nov 29 17:27:03 2009
@@ -7,7 +7,7 @@
     <packaging>car</packaging>
 
     <properties>
-        <!-- This property is required by the car:package mojo -->
+        <!-- This may be helpful in selecting the desired geronimo version -->
         <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
 
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>

Propchange: geronimo/server/trunk/framework/configs/geronimo-boilerplate/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 29 17:27:03 2009
@@ -1,2 +1,2 @@
-/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate:814265,826768
+/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate:814265,826768,832538,885058
 /geronimo/server/trunk/framework/configs/geronimo-boilerplate:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 29 17:27:03 2009
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin

Propchange: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 29 17:27:03 2009
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin

Propchange: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 29 17:27:03 2009
@@ -0,0 +1,11 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin
+

Propchange: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 29 17:27:03 2009
@@ -0,0 +1,11 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin
+

Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Sun Nov 29 17:27:03 2009
@@ -98,10 +98,10 @@
             <id>all-subprojects</id>
             <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
             <modules>
-                <module>geronimo-gbean-deployer/src/it/j2ee-system</module>
-                <module>geronimo-gbean-deployer/src/it/j2ee-system-2</module>
-                <module>geronimo-gbean-deployer/src/it/metadatageneration</module>
-                <module>geronimo-gbean-deployer/src/it/metadatageneration-2</module>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-it1</module>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-it2</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-it3</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-it4</module>
             </modules>
         </profile>
 

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 29 17:27:03 2009
@@ -0,0 +1 @@
+/geronimo/server/branches/2.2/framework/modules/geronimo-kernel/pom.xml:832538,885058

Propchange: geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 29 17:27:03 2009
@@ -1,2 +1,2 @@
-/geronimo/server/branches/2.2/framework/modules/geronimo-upgrade/src/test/resources:826768
+/geronimo/server/branches/2.2/framework/modules/geronimo-upgrade/src/test/resources:826768,832538,885058
 /geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588

Modified: geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml Sun Nov 29 17:27:03 2009
@@ -200,6 +200,13 @@
                     </servers>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Sun Nov 29 17:27:03 2009
@@ -55,6 +55,12 @@
                 <module>activemq-server</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <modules>
+                <module>activemq-server</module>
+            </modules>
+        </profile>
     </profiles>
 
     <properties>

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml Sun Nov 29 17:27:03 2009
@@ -273,11 +273,21 @@
                     <category>Clustering</category>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml Sun Nov 29 17:27:03 2009
@@ -39,5 +39,16 @@
         <module>clustering-test</module>
         <module>plugin-farm-it</module>
     </modules>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 29 17:27:03 2009
@@ -0,0 +1 @@
+/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:832538

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 29 17:27:03 2009
@@ -0,0 +1 @@
+/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:832538

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 29 17:27:03 2009
@@ -0,0 +1 @@
+/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:832538

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Sun Nov 29 17:27:03 2009
@@ -55,6 +55,12 @@
                 <module>clustering-it</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <modules>
+                <module>clustering-it</module>
+            </modules>
+        </profile>
     </profiles>
 
     <properties>

Propchange: geronimo/server/trunk/plugins/dojo/dojo-jetty/
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/filtered-resources/
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsgenCommand.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsimportCommand.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers.xml
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_bindings.xml
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_mixed.xml
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_port.xml
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_service.xml
            ('svn:mergeinfo' removed)

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml Sun Nov 29 17:27:03 2009
@@ -44,40 +44,56 @@
         
     </dependencies>
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>generate-surefire-xml</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <suiteXmlFiles>
+                                    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                                </suiteXmlFiles>
+                                <systemProperties>
+                                    <property>
+                                        <name>geronimoVersion</name>
+                                        <value>${version}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>generate-surefire-xml</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml Sun Nov 29 17:27:03 2009
@@ -201,145 +201,152 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>start</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-server</goal>
-                        </goals>
-                        <configuration>
-                            <logOutput>true</logOutput>
-                            <background>true</background>
-                            <systemProperties>
-                                <property>
-                                    <name>browser</name>
-                                    <value>${browser}</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop-server</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <inherited>false</inherited>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                   <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
-                    <optionSets>
-                        <optionSet>
-                            <id>morememory</id>
-                            <options>
-                                <option>-Xmx512m</option>
-                                <option>-XX:MaxPermSize=128m</option>
-                            </options>
-                        </optionSet>
-
-                        <optionSet>
-                            <id>debug</id>
-                            <options>
-                                <option>-Xdebug</option>
-                                <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
-                            </options>
-                        </optionSet>
-                    </optionSets>
+                    <skip>true</skip>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>start</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-server</goal>
-                        </goals>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>start</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-server</goal>
+                                </goals>
+                                <configuration>
+                                    <logOutput>true</logOutput>
+                                    <background>true</background>
+                                    <systemProperties>
+                                        <property>
+                                            <name>browser</name>
+                                            <value>${browser}</value>
+                                        </property>
+                                    </systemProperties>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop-server</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <inherited>false</inherited>
                         <configuration>
-                            <logOutput>true</logOutput>
-                            <background>true</background>
-                            <verifyTimeout>300</verifyTimeout>
-                            <refresh>true</refresh>
+                           <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
                             <optionSets>
                                 <optionSet>
-                                    <id>default</id>
+                                    <id>morememory</id>
+                                    <options>
+                                        <option>-Xmx512m</option>
+                                        <option>-XX:MaxPermSize=128m</option>
+                                    </options>
+                                </optionSet>
+
+                                <optionSet>
+                                    <id>debug</id>
                                     <options>
-                                       <option>-XX:MaxPermSize=128m</option>
+                                        <option>-Xdebug</option>
+                                        <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
                                     </options>
                                 </optionSet>
                             </optionSets>
                         </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>stop-server</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>shitty-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <projects>
-                        <fileset>
-                            <directory>${project.basedir}</directory>
-                            <includes>
-                                <include>${shittyTestIncludes}</include>
-                            </includes>
-                            <excludes>
-                                <exclude>${shittyTestExcludes}</exclude>
-                            </excludes>
-                        </fileset>
-                    </projects>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>clean</goal>
-                            <goal>install</goal>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>testsuite-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>summarize</id>
-                        <phase>post-site</phase>
-                        <goals>
-                            <goal>summarize</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>mconsole-itest-simple</module>
-            </modules>
+                        <executions>
+                            <execution>
+                                <id>start</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-server</goal>
+                                </goals>
+                                <configuration>
+                                    <logOutput>true</logOutput>
+                                    <background>true</background>
+                                    <verifyTimeout>300</verifyTimeout>
+                                    <refresh>true</refresh>
+                                    <optionSets>
+                                        <optionSet>
+                                            <id>default</id>
+                                            <options>
+                                               <option>-XX:MaxPermSize=128m</option>
+                                            </options>
+                                        </optionSet>
+                                    </optionSets>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>stop</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>stop-server</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>shitty-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <projects>
+                                <fileset>
+                                    <directory>${project.basedir}</directory>
+                                    <includes>
+                                        <include>${shittyTestIncludes}</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>${shittyTestExcludes}</exclude>
+                                    </excludes>
+                                </fileset>
+                            </projects>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>clean</goal>
+                                    <goal>install</goal>
+                                    <goal>test</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>testsuite-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>summarize</id>
+                                <phase>post-site</phase>
+                                <goals>
+                                    <goal>summarize</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 

Modified: geronimo/server/trunk/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/pom.xml Sun Nov 29 17:27:03 2009
@@ -72,6 +72,13 @@
                 <module>mconsole-jetty-server</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <modules>
+                <module>mconsole-jetty-server</module>
+                <module>mconsole-jetty-server/mconsole-itest-simple</module>
+            </modules>
+        </profile>
     </profiles>
 
     <build>        

Propchange: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 29 17:27:03 2009
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder:829715
 /geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa20-builder:829715
-/geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder:829426,829715
+/geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder:829426,829715,832538,885058

Propchange: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties
            ('svn:mergeinfo' removed)

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sun Nov 29 17:27:03 2009
@@ -54,16 +54,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
-
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
-        -->
-        <!--        <version>3.0-SNAPSHOT</version>-->
-
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${version}</geronimoVersion>
 
@@ -2328,6 +2318,19 @@
             </modules>
         </profile>
 
+        <profile>
+            <id>all-subprojects</id>
+
+            <modules>
+                <module>testsupport</module>
+                <module>framework</module>
+                <module>plugins</module>
+                <module>plugingroups</module>
+                <module>assemblies</module>
+                <module>testsuite</module>
+            </modules>
+        </profile>
+
         <!--
         NOTE: This profile is used to enable plugin prefixes for easy command-line usage, as in:
 

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Sun Nov 29 17:27:03 2009
@@ -97,97 +97,6 @@
                 </configuration>
             </plugin>
             
-            <!-- Deploy the ear and invoke the imbedded CORBA app client  -->
-            <!-- ======================================================== -->
-            <!-- ===================================================================== -->
-            <!-- Setup the client log file location for access by the CORBA app client -->
-            <!-- ===================================================================== -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>clientLogFile</name>
-                            <value>${clientLogFile}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <!-- ============================================================================= -->
-                    <!-- These modules must be running before deploying a CORBA module can be deployed -->
-                    <!-- ============================================================================= -->
-                    <execution>
-                        <id>start-j2ee-corba-yoko</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>openejb-corba-deployer</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-
-                    <!-- ======================= -->
-                    <!-- Deploy the CORBA module -->
-                    <!-- ======================= -->
-                    <execution>
-                        <id>deploy-ear</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <!-- =========================== -->
-                    <!-- Invoke the CORBA app client -->
-                    <!-- =========================== -->
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.testsuite/corba-helloworld-client/${version}/car</moduleId>
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
-                        </configuration>
-                    </execution>
-
-                    <!-- ========================= -->
-                    <!-- Undeploy the CORBA module -->
-                    <!-- ========================= -->
-                    <execution>
-                        <id>undeploy-ear</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
 
             <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
@@ -203,4 +112,106 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <!-- Deploy the ear and invoke the imbedded CORBA app client  -->
+                    <!-- ======================================================== -->
+                    <!-- ===================================================================== -->
+                    <!-- Setup the client log file location for access by the CORBA app client -->
+                    <!-- ===================================================================== -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <property>
+                                    <name>clientLogFile</name>
+                                    <value>${clientLogFile}</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <!-- ============================================================================= -->
+                            <!-- These modules must be running before deploying a CORBA module can be deployed -->
+                            <!-- ============================================================================= -->
+                            <execution>
+                                <id>start-j2ee-corba-yoko</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>openejb-corba-deployer</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+
+                            <!-- ======================= -->
+                            <!-- Deploy the CORBA module -->
+                            <!-- ======================= -->
+                            <execution>
+                                <id>deploy-ear</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <!-- =========================== -->
+                            <!-- Invoke the CORBA app client -->
+                            <!-- =========================== -->
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.testsuite/corba-helloworld-client/${version}/car</moduleId>
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                </configuration>
+                            </execution>
+
+                            <!-- ========================= -->
+                            <!-- Undeploy the CORBA module -->
+                            <!-- ========================= -->
+                            <execution>
+                                <id>undeploy-ear</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Sun Nov 29 17:27:03 2009
@@ -84,76 +84,85 @@
                 </configuration>
             </plugin>
 
-            <!-- Deploy the ear and invoke the imbedded CORBA app client -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-
-                <executions>
-                    <!-- These modules must be running before deploying a CORBA module can be deployed -->
-                    <execution>
-                        <id>start-j2ee-corba-yoko</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>openejb-corba-deployer</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-
-                    <!-- Deploy the CORBA module -->
-                    <execution>
-                        <id>deploy-ear</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <!-- Invoke the CORBA app client -->
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <id>run-client</id>
-                        <goals>
-                            <goal>run-client</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>
-                            <!--
-                            <logOutput>true</logOutput>
-                            <logFile>${clientLogFile}</logFile>
-                            -->
-                        </configuration>
-                    </execution>
-
-                    <!-- Undeploy the CORBA module -->
-                    <execution>
-                        <id>undeploy-ear</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <!-- Deploy the ear and invoke the imbedded CORBA app client -->
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+
+                        <executions>
+                            <!-- These modules must be running before deploying a CORBA module can be deployed -->
+                            <execution>
+                                <id>start-j2ee-corba-yoko</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>openejb-corba-deployer</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+
+                            <!-- Deploy the CORBA module -->
+                            <execution>
+                                <id>deploy-ear</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <!-- Invoke the CORBA app client -->
+                            <execution>
+                                <phase>pre-integration-test</phase>
+                                <id>run-client</id>
+                                <goals>
+                                    <goal>run-client</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>
+                                    <!--
+                                    <logOutput>true</logOutput>
+                                    <logFile>${clientLogFile}</logFile>
+                                    -->
+                                </configuration>
+                            </execution>
+
+                            <!-- Undeploy the CORBA module -->
+                            <execution>
+                                <id>undeploy-ear</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=885248&r1=885247&r2=885248&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Sun Nov 29 17:27:03 2009
@@ -20,7 +20,8 @@
 
 <!-- $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>
 
@@ -33,13 +34,13 @@
     <artifactId>corba-mytime-ear</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: My Time EAR</name>
     <packaging>ear</packaging>
-    
+
     <description>Example using CORBA to access a stateless EJB</description>
-    
+
     <!--
     FIXME: Split this module up... one to build the ear, one to run the tests.
     -->
-    
+
     <properties>
         <container>jetty8</container>
     </properties>
@@ -51,14 +52,14 @@
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-mytime-war</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.1_spec</artifactId>
@@ -91,71 +92,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-
-            <!-- Start the Geronimo server in the pre-integration-test and
-                 stop  the Geronimo server in the post-integration-test phase -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-
-                    <!-- These two modules must be running before a CORBA module can be deployed -->
-                    <execution>
-                        <id>start-j2ee-corba-yoko</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>openejb-corba-deployer</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-
-                    <!-- Deploy the CORBA module -->
-                    <execution>
-                        <id>deploy-ear</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <!-- Undeploy the CORBA module -->
-                    <execution>
-                        <id>undeploy-ear</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- Compile the test class(es), which is not done by default for an "ear" package -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -179,7 +115,84 @@
                     </execution>
                 </executions>
             </plugin>
+            
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+
+                    <!-- Start the Geronimo server in the pre-integration-test and
+                         stop  the Geronimo server in the post-integration-test phase -->
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+
+                            <!-- These two modules must be running before a CORBA module can be deployed -->
+                            <execution>
+                                <id>start-j2ee-corba-yoko</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>openejb-corba-deployer</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car
+                                    </moduleId>
+                                </configuration>
+                            </execution>
+
+                            <!-- Deploy the CORBA module -->
+                            <execution>
+                                <id>deploy-ear</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear
+                                    </moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <!-- Undeploy the CORBA module -->
+                            <execution>
+                                <id>undeploy-ear</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>



Mime
View raw message