Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 41205 invoked from network); 1 Sep 2008 06:31:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Sep 2008 06:31:31 -0000 Received: (qmail 91404 invoked by uid 500); 1 Sep 2008 06:31:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 91393 invoked by uid 500); 1 Sep 2008 06:31:28 -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 91383 invoked by uid 99); 1 Sep 2008 06:31:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Aug 2008 23:31:28 -0700 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; Mon, 01 Sep 2008 06:30:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7D52B2388A02; Sun, 31 Aug 2008 23:31:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690859 [3/6] - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty6-javaee5/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/car-maven-plugin/src/test/java/o... Date: Mon, 01 Sep 2008 06:30:48 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080901063107.7D52B2388A02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -13,42 +13,97 @@ org.apache.geronimo.framework - geronimo-j2ee + jee-specs + car + + + org.apache.geronimo.framework + geronimo-core jar org.apache.geronimo.framework - jee-specs + client-system car - org.apache.geronimo.framework - geronimo-management + org.apache.openejb + openejb-loader + jar + + + org.apache.openejb + openejb-javaagent + jar + + + org.apache.openjpa + openjpa + jar + + + org.apache.openejb + asm-finder + jar + + + org.apache.openejb + openejb-jee + jar + + + org.codehaus.swizzle + swizzle-stream + jar + + + org.apache.geronimo.modules + geronimo-openejb + jar + + + org.apache.geronimo.modules + geronimo-client jar org.apache.xbean - xbean-reflect + xbean-naming jar - org.apache.geronimo.framework - client-system - car + commons-lang + commons-lang + jar org.apache.geronimo.framework - geronimo-core + geronimo-j2ee jar org.apache.geronimo.framework - geronimo-crypto + geronimo-management jar - org.apache.geronimo.framework - geronimo-naming + wsdl4j + wsdl4j + jar + + + org.apache.openejb + openejb-client + jar + + + net.sourceforge.serp + serp + jar + + + org.apache.openejb + openejb-server jar @@ -57,18 +112,23 @@ jar - org.apache.geronimo.modules - geronimo-openejb + org.apache.geronimo.framework + geronimo-naming jar - org.apache.geronimo.modules - geronimo-client + org.apache.openejb + openejb-ejbd jar - org.apache.xbean - xbean-naming + commons-collections + commons-collections + jar + + + org.apache.openejb + openejb-core jar Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml (original) +++ geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml Sun Aug 31 23:30:25 2008 @@ -43,6 +43,7 @@ org.apache.geronimo.modules geronimo-connector-builder ${version} + provided Modified: geronimo/server/trunk/plugins/client/geronimo-client/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/client/geronimo-client/pom.xml (original) +++ geronimo/server/trunk/plugins/client/geronimo-client/pom.xml Sun Aug 31 23:30:25 2008 @@ -44,12 +44,24 @@ org.apache.geronimo.framework geronimo-security ${version} + + + org.apache.geronimo.components + geronimo-jaspi + + + + + org.apache.geronimo.framework + jee-specs + ${version} + car - org.apache.geronimo.modules - geronimo-transaction + org.apache.geronimo.framework + geronimo-j2ee ${version} Modified: geronimo/server/trunk/plugins/clustering/clustering/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/clustering/clustering/pom.xml (original) +++ geronimo/server/trunk/plugins/clustering/clustering/pom.xml Sun Aug 31 23:30:25 2008 @@ -79,10 +79,6 @@ org.apache.geronimo.buildsupport car-maven-plugin - - true - true - Clustering

Modified: geronimo/server/trunk/plugins/clustering/farming/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/clustering/farming/pom.xml (original) +++ geronimo/server/trunk/plugins/clustering/farming/pom.xml Sun Aug 31 23:30:25 2008 @@ -79,10 +79,6 @@ org.apache.geronimo.buildsupport car-maven-plugin - - true - true - Clustering

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original) +++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Sun Aug 31 23:30:25 2008 @@ -64,6 +64,13 @@ org.codehaus.wadi wadi-tribes + + + org.slf4j + jcl104-over-slf4j + provided + + Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original) +++ geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml Sun Aug 31 23:30:25 2008 @@ -95,10 +95,6 @@ org.apache.geronimo.buildsupport car-maven-plugin - - true - true - Clustering Modified: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml (original) +++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml Sun Aug 31 23:30:25 2008 @@ -39,6 +39,10 @@ org.apache.geronimo.specs geronimo-concurrent_1.0_spec + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + org.apache.geronimo.modules Modified: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml (original) +++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml Sun Aug 31 23:30:25 2008 @@ -48,6 +48,12 @@ + + org.apache.geronimo.framework + geronimo-j2ee + ${version} + + org.apache.geronimo.framework geronimo-naming ${version} Modified: geronimo/server/trunk/plugins/connector/client-transaction/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/client-transaction/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/client-transaction/pom.xml (original) +++ geronimo/server/trunk/plugins/connector/client-transaction/pom.xml Sun Aug 31 23:30:25 2008 @@ -64,33 +64,33 @@ ${version} - - org.apache.geronimo.components - geronimo-connector - - - - org.apache.geronimo.modules - geronimo-transaction - ${version} - - - - org.apache.geronimo.components - geronimo-transaction - - - - org.apache.geronimo.modules - geronimo-persistence-jpa10 - ${version} - - - - org.apache.geronimo.framework - geronimo-transformer - ${version} - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,10 +100,6 @@ car-maven-plugin Geronimo Core - - true - true -

Modified: geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -17,16 +17,6 @@ jar - org.apache.geronimo.modules - geronimo-persistence-jpa10 - jar - - - org.apache.geronimo.framework - geronimo-transformer - jar - - org.apache.geronimo.configs client-security car @@ -46,4 +36,9 @@ client car + + org.objectweb.howl + howl + jar +

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml (original) +++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml Sun Aug 31 23:30:25 2008 @@ -44,6 +44,13 @@ geronimo-deploy-config ${version} + + org.apache.geronimo.framework + jee-specs + ${version} + car + provided + org.apache.geronimo.modules Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original) +++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Sun Aug 31 23:30:25 2008 @@ -647,16 +647,18 @@ return activationSpecInfos; } - private void setUpDynamicGBean(String activationSpecClassName, GBeanInfoBuilder infoBuilder, Set ignore, ClassLoader cl, boolean decapitalize) throws DeploymentException { + private void setUpDynamicGBean(String adapterClassName, GBeanInfoBuilder infoBuilder, Set ignore, ClassLoader cl, boolean decapitalize) throws DeploymentException { //add all javabean properties that have both getter and setter. Ignore the "required" flag from the dd. Map getters = new HashMap(); Set setters = new HashSet(); Method[] methods; try { - Class activationSpecClass = cl.loadClass(activationSpecClassName); + Class activationSpecClass = cl.loadClass(adapterClassName); methods = activationSpecClass.getMethods(); } catch (ClassNotFoundException e) { - throw new DeploymentException("Can not load activation spec class", e); + throw new DeploymentException("Can not load adapter class in classloader " + cl, e); + } catch (NoClassDefFoundError e) { + throw new DeploymentException("Can not load adapter class in classloader " + cl, e); } for (Method method : methods) { String methodName = method.getName(); Modified: geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml (original) +++ geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml Sun Aug 31 23:30:25 2008 @@ -77,10 +77,10 @@ - - regexp - regexp - + + + + org.apache.geronimo.framework @@ -90,6 +90,11 @@ test + + org.slf4j + jcl104-over-slf4j + test + Modified: geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml (original) +++ geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml Sun Aug 31 23:30:25 2008 @@ -27,11 +27,11 @@ connector 2.2-SNAPSHOT - + org.apache.geronimo.modules geronimo-transaction Geronimo Plugins, Connector :: Transaction - + org.apache.geronimo.components @@ -53,18 +53,21 @@ org.apache.geronimo.specs geronimo-jta_1.1_spec + provided org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec + provided org.objectweb.howl howl + - + Modified: geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -27,21 +27,6 @@ car - org.apache.geronimo.modules - geronimo-persistence-jpa10 - jar - - - org.apache.geronimo.framework - geronimo-transformer - jar - - - org.apache.geronimo.framework - geronimo-core - jar - - org.apache.geronimo.components geronimo-transaction jar @@ -56,4 +41,9 @@ howl jar + + org.apache.geronimo.modules + geronimo-persistence-jpa10 + jar + Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original) +++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Sun Aug 31 23:30:25 2008 @@ -85,12 +85,6 @@ - commons-io - commons-io - provided - - - javax.portlet portlet-api provided @@ -108,6 +102,12 @@ provided + + commons-io + commons-io + provided + + Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java (original) +++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java Sun Aug 31 23:30:25 2008 @@ -49,11 +49,11 @@ return; } String mode = renderRequest.getParameter(MODE_KEY); - ApacheModel model = (ApacheModel)getModel(renderRequest); + ApacheModel model = getModel(renderRequest); if(mode == null || mode.equals("")) { mode = getDefaultMode(); } - MultiPageAbstractHandler handler = (MultiPageAbstractHandler)helpers.get(mode); + MultiPageAbstractHandler handler = helpers.get(mode); try { if(handler != null) { handler.renderView(renderRequest, renderResponse, model); Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java (original) +++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java Sun Aug 31 23:30:25 2008 @@ -16,26 +16,26 @@ */ package org.apache.geronimo.console; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.commons.fileupload.portlet.PortletFileUpload; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadException; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; +import javax.portlet.PortletConfig; import javax.portlet.PortletException; +import javax.portlet.PortletRequest; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.portlet.WindowState; -import javax.portlet.PortletConfig; -import javax.portlet.PortletRequest; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.io.IOException; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.fileupload.portlet.PortletFileUpload; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A base class for porlets consisting on multiple JSPs with before and after Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original) +++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Sun Aug 31 23:30:25 2008 @@ -144,10 +144,6 @@ Administration true - - true - true - Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original) +++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Sun Aug 31 23:30:25 2008 @@ -144,10 +144,6 @@ Administration true - - true - true -

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml (original) +++ geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml Sun Aug 31 23:30:25 2008 @@ -62,16 +62,6 @@ car - - commons-fileupload - commons-fileupload - - - - commons-io - commons-io - - org.apache.geronimo.configs @@ -117,10 +107,6 @@ Administration true - - true - true -

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -7,11 +7,6 @@ car - commons-fileupload - commons-fileupload - jar - - org.apache.geronimo.plugins console-jetty car @@ -26,9 +21,4 @@ plugin car - - commons-io - commons-io - jar - Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml (original) +++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml Sun Aug 31 23:30:25 2008 @@ -62,16 +62,6 @@ car - - commons-fileupload - commons-fileupload - - - - commons-io - commons-io - - org.apache.geronimo.configs @@ -117,10 +107,6 @@ Administration true - - true - true - Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -12,11 +12,6 @@ car - commons-fileupload - commons-fileupload - jar - - org.apache.geronimo.configs j2ee-deployer car @@ -26,9 +21,4 @@ plugin car - - commons-io - commons-io - jar - Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Sun Aug 31 23:30:25 2008 @@ -115,8 +115,15 @@ - org.apache.xmlbeans + org.apache.geronimo.framework xmlbeans + ${version} + car + provided + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec provided Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml (original) +++ geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml Sun Aug 31 23:30:25 2008 @@ -68,6 +68,56 @@ org.apache.openejb openejb-core + + + org.apache.activmq + activmq-core + + + org.apache.openejb + openejb-loader + + + org.apache.openejb + openejb-javaagent + + + org.apache.openejb + asm-finder + + + org.apache.openejb + openejb-jee + + + org.apache.openjpa + openjpa + + + net.sourceforge.serp + serp + + + wedl4j + wedl4j + + + org.codehaus.swizzle + swizzle-stream + + + commons-collections + commons-collections + + + commons-lang + commons-lang + + + wsdl4j + wsdl4j + + @@ -124,10 +174,6 @@ ${openejbcorbaDeployer} Geronimo Core - - true - true -

Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -7,11 +7,6 @@ car - org.apache.openejb - openejb-client - jar - - org.apache.yoko yoko-rmi-impl jar @@ -32,11 +27,6 @@ jar - org.apache.openejb - openejb-core - jar - - org.apache.geronimo.configs client-security car Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml (original) +++ geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml Sun Aug 31 23:30:25 2008 @@ -36,15 +36,22 @@ - org.apache.geronimo.modules - geronimo-openejb + org.apache.geronimo.configs + openejb ${version} + car + provided org.apache.yoko yoko-spec-corba + + cglib + cglib-nodep + provided + Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java (original) +++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java Sun Aug 31 23:30:25 2008 @@ -22,25 +22,21 @@ import javax.ejb.spi.HandleDelegate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.geronimo.gbean.AbstractName; -import org.apache.geronimo.gbean.GBeanLifecycle; -import org.apache.geronimo.gbean.InvalidConfigurationException; -import org.apache.geronimo.corba.security.ServerPolicy; -import org.apache.geronimo.corba.security.ServerPolicyFactory; import org.apache.geronimo.corba.security.config.ConfigAdapter; import org.apache.geronimo.corba.security.config.ssl.SSLConfig; import org.apache.geronimo.corba.security.config.tss.TSSConfig; import org.apache.geronimo.corba.security.config.tss.TSSSSLTransportConfig; import org.apache.geronimo.corba.security.config.tss.TSSTransportMechConfig; import org.apache.geronimo.corba.util.Util; -import org.apache.geronimo.openejb.OpenEjbSystem; -import org.omg.CORBA.Any; +import org.apache.geronimo.gbean.AbstractName; +import org.apache.geronimo.gbean.GBeanLifecycle; +import org.apache.geronimo.gbean.InvalidConfigurationException; import org.omg.CORBA.ORB; import org.omg.CORBA.Policy; import org.omg.PortableServer.POA; import org.omg.PortableServer.POAHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -68,8 +64,7 @@ private POA rootPOA; private NameService nameService; private AbstractName abstractName; - private OpenEjbSystem ejbSystem; - // ORB-specific policy overrides we need to add to POA policies created by + // ORB-specific policy overrides we need to add to POA policies created by // child TSSBeans. private Policy[] policyOverrides = null; @@ -81,7 +76,6 @@ this.host = null; this.abstractName = null; this.policyOverrides = null; - this.ejbSystem = null; } /** @@ -90,20 +84,20 @@ * @param abstractName * The server-created abstract name for this bean instance. * @param configAdapter - * The ORB ConfigAdapter used to interface with the - * JVM-configured ORB instance. + * The ORB ConfigAdapter used to interface with the + * JVM-configured ORB instance. * @param host The hostname we publish ourselves under. * @param listenerPort - * The initial listener port to use. +* The initial listener port to use. * @param classLoader - * The ClassLoader used for ORB context class loading. +* The ClassLoader used for ORB context class loading. * @param nameService - * The initial name service the created ORB will use - * for object resolution. +* The initial name service the created ORB will use +* for object resolution. * @param ssl The SSL configuration, including the KeystoreManager. * */ - public CORBABean(AbstractName abstractName, ConfigAdapter configAdapter, String host, int listenerPort, ClassLoader classLoader, NameService nameService, OpenEjbSystem ejbSystem, SSLConfig ssl) { + public CORBABean(AbstractName abstractName, ConfigAdapter configAdapter, String host, int listenerPort, ClassLoader classLoader, NameService nameService, SSLConfig ssl) { this.abstractName = abstractName; this.classLoader = classLoader; this.configAdapter = configAdapter; @@ -112,7 +106,6 @@ this.host = host; this.listenerPort = listenerPort; this.policyOverrides = null; - this.ejbSystem = ejbSystem; } /** @@ -242,11 +235,6 @@ // TSSBeans are going to need our rootPOA instance, so resolve this now. org.omg.CORBA.Object obj = orb.resolve_initial_references("RootPOA"); rootPOA = POAHelper.narrow(obj); - // if we have an OpenEjbSystem reference, inform the ejb subsystem - // there's now an ORB available for the JNDI context. - if (ejbSystem != null) { - ejbSystem.setORBContext(orb, getHandleDelegate()); - } } catch (NoSuchMethodError e) { log.error("Incorrect level of org.omg.CORBA classes found.\nLikely cause is an incorrect java.endorsed.dirs configuration"); throw new InvalidConfigurationException("CORBA usage requires Yoko CORBA spec classes in java.endorsed.dirs classpath", e); Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java (original) +++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java Sun Aug 31 23:30:25 2008 @@ -57,9 +57,8 @@ infoBuilder.addReference("ConfigAdapter", ConfigAdapter.class, NameFactory.ORB_CONFIG); infoBuilder.addReference("SSLConfig", SSLConfig.class, NameFactory.CORBA_SSL); infoBuilder.addReference("NameService", NameService.class, NameFactory.CORBA_NAME_SERVICE); - infoBuilder.addReference("OpenEjbSystem", OpenEjbSystem.class); - - infoBuilder.setConstructor(new String[]{"abstractName", "ConfigAdapter", "host", "port", "classLoader", "NameService", "OpenEjbSystem", "SSLConfig"}); + + infoBuilder.setConstructor(new String[]{"abstractName", "ConfigAdapter", "host", "port", "classLoader", "NameService", "SSLConfig"}); GBEAN_INFO = infoBuilder.getBeanInfo(); } Added: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java?rev=690859&view=auto ============================================================================== --- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java (added) +++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java Sun Aug 31 23:30:25 2008 @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +package org.apache.geronimo.corba; + +import org.apache.geronimo.openejb.OpenEjbSystem; +import org.apache.geronimo.gbean.AbstractName; +import org.apache.geronimo.corba.security.config.ConfigAdapter; +import org.apache.geronimo.corba.security.config.ssl.SSLConfig; + +/** + * @version $Rev:$ $Date:$ + */ +public class CORBAEjbBean extends CORBABean { + + private final OpenEjbSystem ejbSystem; + + /** + * Instantiate a CORBABean instance. + * + * @param abstractName The server-created abstract name for this bean instance. + * @param configAdapter The ORB ConfigAdapter used to interface with the + * JVM-configured ORB instance. + * @param host The hostname we publish ourselves under. + * @param listenerPort The initial listener port to use. + * @param classLoader The ClassLoader used for ORB context class loading. + * @param nameService The initial name service the created ORB will use + * for object resolution. + * @param ssl The SSL configuration, including the KeystoreManager. + */ + public CORBAEjbBean(AbstractName abstractName, ConfigAdapter configAdapter, String host, int listenerPort, ClassLoader classLoader, NameService nameService, OpenEjbSystem ejbSystem, SSLConfig ssl) { + super(abstractName, configAdapter, host, listenerPort, classLoader, nameService, ssl); + this.ejbSystem = ejbSystem; + } + + /** + * Start the ORB associated with this bean instance. + * + * @throws Exception + */ + @Override + public void doStart() throws Exception { + super.doStart(); + // if we have an OpenEjbSystem reference, inform the ejb subsystem + // there's now an ORB available for the JNDI context. + if (ejbSystem != null) { + ejbSystem.setORBContext(getORB(), getHandleDelegate()); + } + } +} Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java?rev=690859&view=auto ============================================================================== --- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java (added) +++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java Sun Aug 31 23:30:25 2008 @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +package org.apache.geronimo.corba; + +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.openejb.OpenEjbSystem; + +/** + * @version $Rev:$ $Date:$ + */ +public class CORBAEjbBeanGBean { + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CORBAEjbBeanGBean.class, "OpenEJB ORB Adapter", CORBAEjbBean.class, CORBABeanGBean.GBEAN_INFO, NameFactory.CORBA_SERVICE); + + infoBuilder.addReference("OpenEjbSystem", OpenEjbSystem.class); + + infoBuilder.setConstructor(new String[]{"abstractName", "ConfigAdapter", "host", "port", "classLoader", "NameService", "OpenEjbSystem", "SSLConfig"}); + + GBEAN_INFO = infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } +} Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java?rev=690859&view=auto ============================================================================== --- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java (added) +++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java Sun Aug 31 23:30:25 2008 @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +package org.apache.geronimo.corba; + +import org.apache.geronimo.openejb.OpenEjbSystem; +import org.apache.geronimo.gbean.AbstractName; +import org.apache.geronimo.corba.security.config.ConfigAdapter; +import org.apache.geronimo.corba.security.config.ssl.SSLConfig; + +/** + * @version $Rev:$ $Date:$ + */ +public class CORBAEjbBean extends CORBABean { + + private final OpenEjbSystem ejbSystem; + + /** + * Instantiate a CORBABean instance. + * + * @param abstractName The server-created abstract name for this bean instance. + * @param configAdapter The ORB ConfigAdapter used to interface with the + * JVM-configured ORB instance. + * @param host The hostname we publish ourselves under. + * @param listenerPort The initial listener port to use. + * @param classLoader The ClassLoader used for ORB context class loading. + * @param nameService The initial name service the created ORB will use + * for object resolution. + * @param ssl The SSL configuration, including the KeystoreManager. + */ + public CORBAEjbBean(AbstractName abstractName, ConfigAdapter configAdapter, String host, int listenerPort, ClassLoader classLoader, NameService nameService, OpenEjbSystem ejbSystem, SSLConfig ssl) { + super(abstractName, configAdapter, host, listenerPort, classLoader, nameService, ssl); + this.ejbSystem = ejbSystem; + } + + /** + * Start the ORB associated with this bean instance. + * + * @throws Exception + */ + @Override + public void doStart() throws Exception { + super.doStart(); + // if we have an OpenEjbSystem reference, inform the ejb subsystem + // there's now an ORB available for the JNDI context. + if (ejbSystem != null) { + ejbSystem.setORBContext(getORB(), getHandleDelegate()); + } + } +} Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml (original) +++ geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml Sun Aug 31 23:30:25 2008 @@ -49,10 +49,27 @@ + + + + + + + + + + + + + + + - org.apache.geronimo.framework - geronimo-security + org.apache.geronimo.configs + openejb ${version} + car + provided Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java (original) +++ geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java Sun Aug 31 23:30:25 2008 @@ -70,7 +70,7 @@ Naming naming = new Jsr77Naming(); AbstractName testName = naming.createRootName(new Artifact("test", "stuff", "", "ear"), "gbean", NameFactory.CORBA_SERVICE) ; ConfigAdapter configAdapter = new org.apache.geronimo.yoko.ORBConfigAdapter(); - CORBABean corbaBean = new CORBABean(testName, configAdapter, "localhost", 8050, classLoader, null, null, null); + CORBABean corbaBean = new CORBABean(testName, configAdapter, "localhost", 8050, classLoader, null, null); XmlObject xmlObject = getXmlObject(TEST_XML4); TSSConfigEditor editor = new TSSConfigEditor(); Object o = editor.getValue(xmlObject, null, classLoader); Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml (original) +++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml Sun Aug 31 23:30:25 2008 @@ -111,10 +111,6 @@ ${openejbcorbaDeployer} - - true - true - EJB

Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -12,11 +12,6 @@ jar

- org.apache.yoko - yoko-spec-corba - jar - - org.apache.bcel bcel jar Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml (original) +++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml Sun Aug 31 23:30:25 2008 @@ -52,7 +52,7 @@ - + ${PlanORBSSLHost} ${PlanORBSSLPort} @@ -89,7 +89,7 @@ - + ${PlanORBHost} ${PlanORBPort} Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml (original) +++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml Sun Aug 31 23:30:25 2008 @@ -73,9 +73,6 @@ org.apache.geronimo.buildsupport car-maven-plugin - - false - EJB Container @@ -84,21 +81,6 @@ car classes - - org.apache.geronimo.modules - geronimo-corba-builder - jar - - - org.apache.geronimo.configs - j2ee-deployer - car - - - org.apache.geronimo.modules - geronimo-corba - jar -

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original) +++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Sun Aug 31 23:30:25 2008 @@ -64,28 +64,14 @@ org.apache.geronimo.buildsupport car-maven-plugin - - false - Web Services org.apache.geronimo.configs - jaxws-deployer - car - - - org.apache.geronimo.configs cxf car classes - - org.apache.geronimo.modules - geronimo-cxf-builder - jar - classes -

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original) +++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Sun Aug 31 23:30:25 2008 @@ -71,17 +71,10 @@ org.apache.geronimo.buildsupport car-maven-plugin - - false - Web Services - org.apache.geronimo.configs - jaxws-ejb-deployer - car - - + org.apache.geronimo.configs cxf-deployer car @@ -93,12 +86,6 @@ car classes - - org.apache.geronimo.modules - geronimo-cxf-ejb-builder - jar - classes -

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml (original) +++ geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml Sun Aug 31 23:30:25 2008 @@ -73,10 +73,6 @@ org.apache.geronimo.buildsupport car-maven-plugin - - true - true - Web Services Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original) +++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Sun Aug 31 23:30:25 2008 @@ -46,12 +46,12 @@ provided

- - org.apache.geronimo.configs - j2ee-server - car - ${version} - + + + + + + org.apache.geronimo.framework Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -8,17 +8,27 @@ org.apache.cxf - cxf-rt-ws-addr + cxf-tools-common + jar + + + org.apache.ws.commons.schema + XmlSchema jar org.apache.cxf - cxf-rt-frontend-simple + cxf-rt-core jar org.apache.cxf - cxf-tools-common + cxf-api + jar + + + org.apache.cxf + cxf-rt-bindings-soap jar @@ -33,18 +43,13 @@ org.apache.cxf - cxf-api + cxf-rt-frontend-simple jar - org.apache.geronimo.configs - webservices-common - car - - - org.apache.geronimo.configs - spring - car + org.apache.cxf + cxf-rt-databinding-jaxb + jar org.apache.cxf @@ -53,17 +58,22 @@ org.apache.geronimo.configs - j2ee-server + webservices-common + car + + + org.apache.geronimo.configs + spring car org.apache.cxf - cxf-common-utilities + cxf-rt-transports-http jar org.apache.cxf - cxf-rt-frontend-jaxws + cxf-rt-ws-addr jar @@ -72,23 +82,13 @@ jar - org.apache.cxf - cxf-rt-transports-http - jar - - org.apache.geronimo.modules geronimo-cxf jar org.apache.cxf - cxf-rt-core - jar - - - org.apache.cxf - cxf-rt-databinding-jaxb + cxf-rt-frontend-jaxws jar @@ -97,13 +97,13 @@ car - org.apache.ws.commons.schema - XmlSchema + org.apache.cxf + cxf-common-utilities jar - org.apache.cxf - cxf-rt-bindings-soap + com.sun.xml.fastinfoset + FastInfoset jar

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml (original) +++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml Sun Aug 31 23:30:25 2008 @@ -54,9 +54,10 @@ - org.apache.geronimo.modules - geronimo-cxf + org.apache.geronimo.configs + cxf ${version} + car Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml (original) +++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml Sun Aug 31 23:30:25 2008 @@ -34,9 +34,10 @@ - org.apache.geronimo.modules - geronimo-webservices + org.apache.geronimo.configs + webservices-common ${version} + car Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml (original) +++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml Sun Aug 31 23:30:25 2008 @@ -56,13 +56,13 @@ war provided - + org.apache.geronimo.plugins console-jetty @@ -71,6 +71,7 @@ + org.apache.geronimo.framework geronimo-gbean-deployer ${version} @@ -84,39 +85,6 @@ car - - org.apache.xbean - xbean-naming - - - - org.apache.geronimo.framework - geronimo-kernel - ${version} - - - - org.apache.geronimo.framework - geronimo-management - ${version} - - - - org.apache.geronimo.specs - geronimo-servlet_2.5_spec - - - - org.apache.geronimo.framework - geronimo-j2ee - ${version} - - - - org.directwebremoting - dwr - - org.apache.geronimo.configs @@ -153,10 +121,6 @@ Debug true - - true - true -

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff ============================================================================== --- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008 @@ -12,53 +12,18 @@ car

- org.directwebremoting - dwr - jar - - - org.apache.geronimo.framework - geronimo-j2ee - jar - - org.apache.geronimo.plugins console-jetty car - org.apache.geronimo.framework - geronimo-management - jar - - org.apache.geronimo.configs dojo-legacy-jetty6 car org.apache.geronimo.framework - geronimo-kernel - jar - - - org.apache.geronimo.specs - geronimo-servlet_2.5_spec - jar - - - org.apache.xbean - xbean-naming - jar - - - org.apache.geronimo.framework geronimo-gbean-deployer car - - org.apache.geronimo.plugins - console-core - jar -