Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 75316 invoked from network); 14 Jun 2009 07:40:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Jun 2009 07:40:28 -0000 Received: (qmail 63892 invoked by uid 500); 14 Jun 2009 07:40:39 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 63811 invoked by uid 500); 14 Jun 2009 07:40:39 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 63802 invoked by uid 99); 14 Jun 2009 07:40:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jun 2009 07:40:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jun 2009 07:40:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 354E52388897; Sun, 14 Jun 2009 07:40:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r784518 [1/6] - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/ framework/configs/client-system/ framework/configs/client-system/src/main/history/ framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/ ... Date: Sun, 14 Jun 2009 07:40:08 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090614074015.354E52388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Sun Jun 14 07:40:05 2009 New Revision: 784518 URL: http://svn.apache.org/viewvc?rev=784518&view=rev Log: GERONIMO-4684, GERONIMO-4685 Use our tomcat build, configure tomcat using server.xml. Also includes some spec jar updates including using our jaxb spec jar Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatServerGBean.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ClusterType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ContextType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/EjbType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/EngineType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/EnvironmentType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ExecutorType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/HostType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java (with props) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml (with props) geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml (with props) Removed: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml geronimo/server/trunk/framework/configs/client-system/pom.xml geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/j2ee-system/pom.xml geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/jee-specs/pom.xml geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/online-deployer/pom.xml geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml geronimo/server/trunk/framework/modules/geronimo-security/pom.xml geronimo/server/trunk/framework/modules/geronimo-system/pom.xml geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml geronimo/server/trunk/plugins/axis2/pom.xml geronimo/server/trunk/plugins/client/client/pom.xml geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml geronimo/server/trunk/plugins/clustering/clustering/src/main/history/dependencies.xml geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml geronimo/server/trunk/plugins/clustering/pom.xml geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml geronimo/server/trunk/plugins/cxf/pom.xml geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/jasper/jasper/pom.xml geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml geronimo/server/trunk/plugins/jasper/pom.xml geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/src/main/history/dependencies.xml geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/src/main/history/dependencies.xml geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml geronimo/server/trunk/plugins/monitoring/agent-jar/pom.xml geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java geronimo/server/trunk/plugins/tomcat/pom.xml geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml geronimo/server/trunk/pom.xml geronimo/server/trunk/repository/pom.xml Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original) +++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Sun Jun 14 07:40:05 2009 @@ -40,8 +40,8 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/client-system/pom.xml (original) +++ geronimo/server/trunk/framework/configs/client-system/pom.xml Sun Jun 14 07:40:05 2009 @@ -76,8 +76,8 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -7,53 +7,63 @@ car - javax.xml.bind - jaxb-api + org.apache.geronimo.framework + geronimo-common jar - commons-jexl - commons-jexl + org.apache.geronimo.framework + geronimo-kernel jar - org.apache.xbean - xbean-reflect + asm + asm jar - com.sun.xml.bind - jaxb-impl + asm + asm-commons jar - org.apache.geronimo.framework - geronimo-common + cglib + cglib-nodep jar - org.apache.geronimo.framework - geronimo-kernel + org.apache.xbean + xbean-reflect jar - cglib - cglib-nodep + com.thoughtworks.xstream + xstream jar - org.apache.geronimo.specs - geronimo-activation_1.1_spec + xpp3 + xpp3_min jar - jline - jline + org.slf4j + slf4j-api jar - xpp3 - xpp3_min + org.apache.geronimo.framework + geronimo-system + jar + + + org.apache.geronimo.framework + geronimo-cli + jar + + + commons-cli + commons-cli jar @@ -62,58 +72,63 @@ jar - org.codehaus.woodstox - wstx-asl + commons-jexl + commons-jexl + jar + + + log4j + log4j jar org.apache.geronimo.specs - geronimo-stax-api_1.0_spec + geronimo-jaxb_2.1_spec jar - org.slf4j - slf4j-api + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec jar - org.slf4j - jul-to-slf4j + jline + jline jar - org.apache.geronimo.framework - geronimo-system + com.sun.xml.bind + jaxb-impl jar - asm - asm + javax.xml.bind + jaxb-api jar - commons-cli - commons-cli + javax.xml.bind + jsr173_api jar - com.thoughtworks.xstream - xstream + javax.activation + activation jar - asm - asm-commons + org.codehaus.woodstox + wstx-asl jar - log4j - log4j + org.slf4j + jul-to-slf4j jar - org.apache.geronimo.framework - geronimo-cli + org.apache.geronimo.specs + geronimo-activation_1.1_spec jar Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -7,118 +7,108 @@ car - javax.xml.bind - jaxb-api + org.apache.geronimo.framework + geronimo-common jar - commons-jexl - commons-jexl + org.apache.geronimo.framework + geronimo-kernel jar - org.apache.xmlbeans - xmlbeans + asm + asm jar - org.apache.xbean - xbean-reflect + asm + asm-commons jar - - - - - - org.apache.geronimo.framework - geronimo-common + cglib + cglib-nodep jar - org.apache.geronimo.framework - geronimo-deploy-config + org.apache.xbean + xbean-reflect jar - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec + com.thoughtworks.xstream + xstream jar - asm - asm + xpp3 + xpp3_min jar - - - - - - commons-cli - commons-cli + org.slf4j + slf4j-api jar - com.thoughtworks.xstream - xstream + org.apache.geronimo.framework + geronimo-deployment jar - asm - asm-commons + org.apache.geronimo.framework + geronimo-system jar - log4j - log4j + org.apache.geronimo.framework + geronimo-cli + jar + + + commons-cli + commons-cli jar - - - - - org.apache.geronimo.framework - geronimo-kernel + geronimo-crypto jar - xml-resolver - xml-resolver + commons-jexl + commons-jexl jar - cglib - cglib-nodep + log4j + log4j jar - xpp3 - xpp3_min + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec jar - org.apache.geronimo.framework - geronimo-crypto + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec jar - org.apache.geronimo.framework - geronimo-deployment + org.apache.xmlbeans + xmlbeans jar - org.slf4j - slf4j-api + xml-resolver + xml-resolver jar org.apache.geronimo.framework - geronimo-system + geronimo-service-builder jar @@ -128,12 +118,7 @@ org.apache.geronimo.framework - geronimo-cli - jar - - - org.apache.geronimo.framework - geronimo-service-builder + geronimo-deploy-config jar Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml (original) +++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml Sun Jun 14 07:40:05 2009 @@ -88,10 +88,10 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec - + com.sun.xml.bind jaxb-impl @@ -181,8 +181,8 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec com.sun.xml.bind Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml (original) +++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml Sun Jun 14 07:40:05 2009 @@ -88,10 +88,10 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec - + com.sun.xml.bind jaxb-impl @@ -181,8 +181,8 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec com.sun.xml.bind @@ -278,9 +278,9 @@ classes - javax.xml.bind - jaxb-api - 2.1 + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec + 1.0-SNAPSHOT jar classes Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -7,28 +7,33 @@ car - javax.xml.bind - jaxb-api + org.apache.geronimo.framework + gshell-framework + car + + + org.apache.geronimo.framework + geronimo-commands jar org.apache.geronimo.framework - geronimo-plugin + geronimo-kernel jar - org.apache.ant - ant + asm + asm jar - org.apache.xmlbeans - xmlbeans + asm + asm-commons jar - org.apache.geronimo.framework - geronimo-deploy-tool + cglib + cglib-nodep jar @@ -37,58 +42,53 @@ jar - org.apache.geronimo.framework - geronimo-common + org.codehaus.groovy + groovy-all-minimal jar - org.apache.geronimo.framework - geronimo-deploy-config + org.apache.ant + ant jar org.apache.geronimo.framework - geronimo-deploy-jsr88 - jar - - - org.apache.ant - ant-launcher + geronimo-cli jar - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec + commons-cli + commons-cli jar - asm - asm + org.apache.geronimo.framework + geronimo-deploy-tool jar - commons-cli - commons-cli + org.apache.geronimo.specs + geronimo-javaee-deployment_1.1MR3_spec jar - asm - asm-commons + org.apache.geronimo.framework + geronimo-service-builder jar - log4j - log4j + org.apache.geronimo.framework + geronimo-deployment jar org.apache.geronimo.framework - geronimo-kernel + geronimo-system jar - cglib - cglib-nodep + org.apache.xmlbeans + xmlbeans jar @@ -97,53 +97,53 @@ jar - org.apache.geronimo.framework - geronimo-commands + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec jar org.apache.geronimo.framework - geronimo-crypto - jar - - - org.codehaus.plexus - plexus-archiver + geronimo-deploy-jsr88 jar - org.codehaus.groovy - groovy-all-minimal + org.apache.geronimo.framework + geronimo-common jar org.apache.geronimo.framework - geronimo-deployment + geronimo-crypto jar - org.apache.geronimo.framework - geronimo-system + log4j + log4j jar org.apache.geronimo.specs - geronimo-javaee-deployment_1.1MR3_spec + geronimo-jaxb_2.1_spec jar org.apache.geronimo.framework - gshell-framework - car + geronimo-plugin + jar - org.apache.geronimo.framework - geronimo-cli + org.codehaus.plexus + plexus-archiver jar org.apache.geronimo.framework - geronimo-service-builder + geronimo-deploy-config + jar + + + org.apache.ant + ant-launcher jar Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -8,22 +8,27 @@ org.apache.geronimo.framework + rmi-naming + car + + + org.apache.geronimo.framework geronimo-security jar - org.apache.geronimo.framework - geronimo-jmx-remoting + org.apache.geronimo.components + geronimo-jaspi jar org.apache.geronimo.framework - rmi-naming - car + geronimo-jmx-remoting + jar - org.apache.geronimo.components - geronimo-jaspi + org.apache.geronimo.specs + geronimo-jaspi_1.0_spec jar Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original) +++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Sun Jun 14 07:40:05 2009 @@ -93,8 +93,8 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -7,138 +7,153 @@ car + org.apache.geronimo.framework + geronimo-common + jar + + + org.apache.geronimo.framework + geronimo-kernel + jar + + asm asm jar - javax.xml.bind - jaxb-api + asm + asm-commons jar - commons-jexl - commons-jexl + cglib + cglib-nodep jar - com.envoisolutions.sxc - sxc-jaxb + org.apache.xbean + xbean-reflect jar - org.apache.geronimo.framework - geronimo-common + com.thoughtworks.xstream + xstream jar - org.apache.geronimo.specs - geronimo-activation_1.1_spec + xpp3 + xpp3_min jar - jline - jline + org.slf4j + slf4j-api jar - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec + org.apache.geronimo.framework + geronimo-config-groovy-transformer jar - asm - asm-commons + org.codehaus.groovy + groovy-all-minimal jar - commons-cli - commons-cli + org.apache.geronimo.framework + geronimo-system jar - com.thoughtworks.xstream - xstream + org.apache.geronimo.framework + geronimo-cli + jar + + + commons-cli + commons-cli jar org.apache.geronimo.framework - geronimo-config-groovy-transformer + geronimo-crypto jar - log4j - log4j + commons-jexl + commons-jexl jar - org.slf4j - slf4j-api + log4j + log4j jar - org.slf4j - jcl-over-slf4j + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec jar - com.sun.xml.bind - jaxb-impl + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec jar org.apache.geronimo.framework - geronimo-kernel + geronimo-transformer jar - cglib - cglib-nodep + jline + jline jar - org.codehaus.woodstox - wstx-asl + com.sun.xml.bind + jaxb-impl jar - org.slf4j - slf4j-log4j12 + javax.xml.bind + jaxb-api jar - xpp3 - xpp3_min + javax.xml.bind + jsr173_api jar - org.apache.geronimo.framework - geronimo-crypto + javax.activation + activation jar - com.envoisolutions.sxc - sxc-runtime + org.codehaus.woodstox + wstx-asl jar - org.codehaus.groovy - groovy-all-minimal + com.envoisolutions.sxc + sxc-jaxb jar - org.apache.geronimo.framework - geronimo-system + com.envoisolutions.sxc + sxc-runtime jar - org.apache.xbean - xbean-reflect + org.slf4j + slf4j-log4j12 jar - org.apache.geronimo.framework - geronimo-transformer + org.slf4j + jcl-over-slf4j jar @@ -147,8 +162,8 @@ jar - org.apache.geronimo.framework - geronimo-cli + org.apache.geronimo.specs + geronimo-activation_1.1_spec jar Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original) +++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Sun Jun 14 07:40:05 2009 @@ -87,7 +87,7 @@ org.apache.geronimo.specs - geronimo-jaspi_1.0_spec + geronimo-jaspic_1.0_spec Modified: geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -33,7 +33,7 @@ org.apache.geronimo.specs - ${connectorSpec} + geronimo-j2ee-connector_1.5_spec jar @@ -48,7 +48,7 @@ org.apache.geronimo.specs - geronimo-jaspi_1.0_spec + geronimo-jaspic_1.0_spec jar @@ -88,7 +88,7 @@ org.apache.geronimo.specs - ${servletSpec} + geronimo-servlet_2.5_spec jar Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original) +++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Sun Jun 14 07:40:05 2009 @@ -104,8 +104,8 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec com.sun.xml.bind Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -7,23 +7,28 @@ car - javax.xml.bind - jaxb-api + org.apache.geronimo.framework + geronimo-common jar - commons-jexl - commons-jexl + org.apache.geronimo.framework + geronimo-kernel jar - org.apache.xmlbeans - xmlbeans + asm + asm jar - org.apache.geronimo.framework - geronimo-plugin + asm + asm-commons + jar + + + cglib + cglib-nodep jar @@ -32,43 +37,48 @@ jar - org.apache.geronimo.framework - geronimo-deploy-tool + com.thoughtworks.xstream + xstream jar - org.codehaus.woodstox - wstx-asl + xpp3 + xpp3_min + jar + + + org.slf4j + slf4j-api jar org.apache.geronimo.framework - geronimo-common + geronimo-system jar - org.apache.geronimo.specs - geronimo-activation_1.1_spec + org.apache.geronimo.framework + geronimo-cli jar - jline - jline + org.apache.geronimo.framework + geronimo-crypto jar - org.codehaus.plexus - plexus-component-api + commons-jexl + commons-jexl jar - org.apache.geronimo.framework - geronimo-deploy-jsr88 + log4j + log4j jar - org.codehaus.plexus - plexus-utils + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec jar @@ -77,98 +87,103 @@ jar - asm - asm + org.apache.geronimo.framework + geronimo-deploy-jsr88 jar - commons-cli - commons-cli + org.apache.geronimo.framework + geronimo-plugin jar - com.thoughtworks.xstream - xstream + org.codehaus.plexus + plexus-archiver jar - asm - asm-commons + org.codehaus.plexus + plexus-utils jar - log4j - log4j + org.codehaus.plexus + plexus-container-default jar - com.sun.xml.bind - jaxb-impl + org.codehaus.plexus + plexus-component-api jar - org.codehaus.plexus - plexus-container-default + commons-cli + commons-cli jar org.apache.geronimo.framework - geronimo-kernel + geronimo-deploy-tool jar - xml-resolver - xml-resolver + org.apache.geronimo.framework + geronimo-service-builder jar - cglib - cglib-nodep + org.apache.geronimo.framework + geronimo-deployment jar - org.apache.geronimo.framework - geronimo-crypto + org.apache.xmlbeans + xmlbeans jar - xpp3 - xpp3_min + xml-resolver + xml-resolver jar - org.codehaus.plexus - plexus-archiver + jline + jline jar - org.apache.geronimo.framework - geronimo-deployment + org.apache.geronimo.plugins.classloaders + geronimo-javaee-deployment_1.1MR3_spec + car + + + com.sun.xml.bind + jaxb-impl jar - org.slf4j - slf4j-api + javax.xml.bind + jaxb-api jar - org.apache.geronimo.framework - geronimo-system + javax.xml.bind + jsr173_api jar - org.apache.geronimo.plugins.classloaders - geronimo-javaee-deployment_1.1MR3_spec - car + javax.activation + activation + jar - org.apache.geronimo.framework - geronimo-cli + org.codehaus.woodstox + wstx-asl jar - org.apache.geronimo.framework - geronimo-service-builder + org.apache.geronimo.specs + geronimo-activation_1.1_spec jar Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original) +++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Sun Jun 14 07:40:05 2009 @@ -83,8 +83,8 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -7,23 +7,28 @@ car - javax.xml.bind - jaxb-api + org.apache.geronimo.framework + geronimo-common jar - commons-jexl - commons-jexl + org.apache.geronimo.framework + geronimo-kernel jar - org.apache.geronimo.framework - geronimo-plugin + asm + asm jar - org.apache.geronimo.framework - geronimo-deploy-jsr88-bootstrapper + asm + asm-commons + jar + + + cglib + cglib-nodep jar @@ -32,73 +37,78 @@ jar - org.codehaus.woodstox - wstx-asl + com.thoughtworks.xstream + xstream jar - org.apache.geronimo.framework - geronimo-common + xpp3 + xpp3_min jar - org.apache.geronimo.specs - geronimo-activation_1.1_spec + org.slf4j + slf4j-api jar - org.codehaus.plexus - plexus-component-api + org.apache.geronimo.framework + geronimo-crypto jar org.apache.geronimo.framework - geronimo-deploy-jsr88 + geronimo-system jar org.apache.geronimo.framework - geronimo-deploy-config + geronimo-cli jar - org.codehaus.plexus - plexus-utils + commons-cli + commons-cli jar - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec + commons-jexl + commons-jexl jar - asm - asm + log4j + log4j jar - commons-cli - commons-cli + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec jar - com.thoughtworks.xstream - xstream + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec jar - asm - asm-commons + org.apache.geronimo.framework + geronimo-deploy-jsr88 jar - log4j - log4j + org.apache.geronimo.framework + geronimo-plugin jar - com.sun.xml.bind - jaxb-impl + org.codehaus.plexus + plexus-archiver + jar + + + org.codehaus.plexus + plexus-utils jar @@ -107,48 +117,53 @@ jar - org.apache.geronimo.framework - geronimo-kernel + org.codehaus.plexus + plexus-component-api jar - cglib - cglib-nodep + org.apache.geronimo.framework + geronimo-deploy-config jar org.apache.geronimo.framework - geronimo-crypto + geronimo-deploy-jsr88-bootstrapper jar - xpp3 - xpp3_min + org.apache.geronimo.specs + geronimo-javaee-deployment_1.1MR3_spec jar - org.codehaus.plexus - plexus-archiver + com.sun.xml.bind + jaxb-impl jar - org.slf4j - slf4j-api + javax.xml.bind + jaxb-api jar - org.apache.geronimo.framework - geronimo-system + javax.xml.bind + jsr173_api jar - org.apache.geronimo.specs - geronimo-javaee-deployment_1.1MR3_spec + javax.activation + activation jar - org.apache.geronimo.framework - geronimo-cli + org.codehaus.woodstox + wstx-asl + jar + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec jar Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original) +++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Sun Jun 14 07:40:05 2009 @@ -94,10 +94,10 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec - + com.sun.xml.bind jaxb-impl Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -7,63 +7,58 @@ car - javax.xml.bind - jaxb-api - jar - - - commons-jexl - commons-jexl + org.apache.geronimo.framework + geronimo-common jar org.apache.geronimo.framework - geronimo-plugin + geronimo-kernel jar - org.apache.xbean - xbean-reflect + asm + asm jar - org.codehaus.woodstox - wstx-asl + asm + asm-commons jar - org.apache.geronimo.framework - geronimo-common + cglib + cglib-nodep jar - org.apache.geronimo.specs - geronimo-activation_1.1_spec + org.apache.xbean + xbean-reflect jar - jline - jline + com.thoughtworks.xstream + xstream jar - org.codehaus.plexus - plexus-component-api + xpp3 + xpp3_min jar - org.codehaus.plexus - plexus-utils + org.slf4j + slf4j-api jar - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec + org.apache.geronimo.framework + geronimo-system jar - asm - asm + org.apache.geronimo.framework + geronimo-cli jar @@ -72,13 +67,13 @@ jar - com.thoughtworks.xstream - xstream + org.apache.geronimo.framework + geronimo-crypto jar - asm - asm-commons + commons-jexl + commons-jexl jar @@ -87,53 +82,73 @@ jar - org.codehaus.plexus - plexus-container-default + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec jar - com.sun.xml.bind - jaxb-impl + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + jar + + + jline + jline jar org.apache.geronimo.framework - geronimo-kernel + geronimo-plugin jar - cglib - cglib-nodep + org.codehaus.plexus + plexus-archiver jar - xpp3 - xpp3_min + org.codehaus.plexus + plexus-utils jar - org.apache.geronimo.framework - geronimo-crypto + org.codehaus.plexus + plexus-container-default jar org.codehaus.plexus - plexus-archiver + plexus-component-api jar - org.slf4j - slf4j-api + com.sun.xml.bind + jaxb-impl jar - org.apache.geronimo.framework - geronimo-system + javax.xml.bind + jaxb-api jar - org.apache.geronimo.framework - geronimo-cli + javax.xml.bind + jsr173_api + jar + + + javax.activation + activation + jar + + + org.codehaus.woodstox + wstx-asl + jar + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec jar Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009 @@ -7,158 +7,158 @@ car - javax.xml.bind - jaxb-api + org.apache.geronimo.framework + geronimo-deploy-tool jar - commons-jexl - commons-jexl + org.apache.geronimo.specs + geronimo-javaee-deployment_1.1MR3_spec jar - org.apache.xmlbeans - xmlbeans + org.apache.geronimo.framework + geronimo-service-builder jar org.apache.geronimo.framework - geronimo-plugin + geronimo-deployment jar org.apache.geronimo.framework - geronimo-deploy-tool + geronimo-system jar - org.apache.xbean - xbean-reflect + org.apache.xmlbeans + xmlbeans jar - org.apache.geronimo.framework - geronimo-common + xml-resolver + xml-resolver jar - jline - jline + org.slf4j + slf4j-api jar - org.codehaus.plexus - plexus-component-api + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec jar org.apache.geronimo.framework - geronimo-deploy-config + geronimo-cli jar org.apache.geronimo.framework - geronimo-deploy-jsr88 + geronimo-kernel jar - org.codehaus.plexus - plexus-utils + commons-cli + commons-cli jar - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec + org.apache.geronimo.framework + geronimo-deploy-jsr88 jar - asm - asm + org.apache.geronimo.framework + geronimo-common jar - commons-cli - commons-cli + org.apache.geronimo.framework + geronimo-plugin jar - com.thoughtworks.xstream - xstream + org.codehaus.plexus + plexus-archiver jar - asm - asm-commons + org.codehaus.plexus + plexus-utils jar - log4j - log4j + org.codehaus.plexus + plexus-container-default jar org.codehaus.plexus - plexus-container-default + plexus-component-api jar org.apache.geronimo.framework - geronimo-kernel + geronimo-deploy-config jar - xml-resolver - xml-resolver + jline + jline jar - cglib - cglib-nodep + asm + asm jar - org.apache.geronimo.framework - geronimo-crypto + asm + asm-commons jar - xpp3 - xpp3_min + cglib + cglib-nodep jar - org.codehaus.plexus - plexus-archiver + org.apache.xbean + xbean-reflect jar - org.slf4j - slf4j-api + com.thoughtworks.xstream + xstream jar - org.apache.geronimo.framework - geronimo-deployment + xpp3 + xpp3_min jar org.apache.geronimo.framework - geronimo-system + geronimo-crypto jar - org.apache.geronimo.specs - geronimo-javaee-deployment_1.1MR3_spec + commons-jexl + commons-jexl jar - org.apache.geronimo.framework - geronimo-cli + log4j + log4j jar - org.apache.geronimo.framework - geronimo-service-builder + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec jar Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original) +++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Sun Jun 14 07:40:05 2009 @@ -80,7 +80,7 @@ org.apache.geronimo.specs - geronimo-jaspi_1.0_spec + geronimo-jaspic_1.0_spec compile Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original) +++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Sun Jun 14 07:40:05 2009 @@ -82,8 +82,8 @@ - javax.xml.bind - jaxb-api + org.apache.geronimo.specs + geronimo-jaxb_2.1_spec Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml (original) +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml Sun Jun 14 07:40:05 2009 @@ -114,6 +114,12 @@ org.apache.activemq activemq-xmpp 5.3-SNAPSHOT + + + javax.xml.bind + jaxb-api + + org.apache.activemq Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml?rev=784518&r1=784517&r2=784518&view=diff ============================================================================== --- geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml (original) +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml Sun Jun 14 07:40:05 2009 @@ -125,6 +125,12 @@ org.apache.activemq activemq-xmpp 5.3-SNAPSHOT + + + javax.xml.bind + jaxb-api + + org.apache.activemq