Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 3175 invoked from network); 19 Feb 2007 20:26:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Feb 2007 20:26:20 -0000 Received: (qmail 46873 invoked by uid 500); 19 Feb 2007 20:26:23 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 46811 invoked by uid 500); 19 Feb 2007 20:26:23 -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 46758 invoked by uid 99); 19 Feb 2007 20:26:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Feb 2007 12:26:22 -0800 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=RCVD_IN_SORBS_WEB X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [209.86.89.69] (HELO elasmtp-mealy.atl.sa.earthlink.net) (209.86.89.69) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Feb 2007 12:26:09 -0800 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=dk20050327; d=earthlink.net; b=GIBD7XpK4dlAYuH9owAam+eec6gvkPLLzuBKFvWGbS+0o/EmwX0lLR2oo9G2uJ1C; h=Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding:X-ELNK-Trace:X-Originating-IP; Received: from [129.33.49.251] (helo=[9.37.214.136]) by elasmtp-mealy.atl.sa.earthlink.net with asmtp (Exim 4.34) id 1HJF51-0007Zk-SQ; Mon, 19 Feb 2007 15:25:48 -0500 Message-ID: <45DA07CE.4030707@earthlink.net> Date: Mon, 19 Feb 2007 15:25:50 -0500 From: Joe Bohn User-Agent: Thunderbird 1.5.0.9 (Macintosh/20061207) MIME-Version: 1.0 To: dev@geronimo.apache.org CC: scm@geronimo.apache.org Subject: Re: svn commit: r508724 [1/3] - in /geronimo/server/trunk: applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/ assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-boilerplate-minimal/src/main/resources/va... References: <20070217080133.9E4391A981A@eris.apache.org> <45D9D3D0.20504@earthlink.net> In-Reply-To: <45D9D3D0.20504@earthlink.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ELNK-Trace: c408501814fc19611aa676d7e74259b7b3291a7d08dfec797b25685899f037492a5f5ef51fdb6dd4350badd9bab72f9c350badd9bab72f9c350badd9bab72f9c X-Originating-IP: 129.33.49.251 X-Virus-Checked: Checked by ClamAV on apache.org Just for clarification .... The problem with the tck is that all jsr-88 deploys are failing with the following error. Caused by: org.apache.geronimo.gbean.InvalidConfigurationException: Could not load GBeanInfo class from classloader: [org.apache .geronimo.kernel.classloader.JarFileClassLoader id=org.apache.geronimo.configs/jsr88-deploymentfactory/2.0-SNAPSHOT/car] classNa me=org.apache.geronimo.system.configuration.RepositoryConfigurationStore at org.apache.geronimo.gbean.runtime.GBeanInstance.(GBeanInstance.java:229) at org.apache.geronimo.kernel.basic.BasicKernel.loadGBean(BasicKernel.java:354) at org.apache.geronimo.kernel.config.ConfigurationUtil.startConfigurationGBeans(ConfigurationUtil.java:419) ... 27 more java.lang.Exception: Does not implement DeploymentFactory Joe Joe Bohn wrote: > This appears to be breaking tck again. Please take a look at the tck > list for details of the problem. > > Thanks, > Joe > > > gdamour@apache.org wrote: >> Author: gdamour >> Date: Sat Feb 17 00:01:26 2007 >> New Revision: 508724 >> >> URL: http://svn.apache.org/viewvc?view=rev&rev=508724 >> Log: >> Second attempt to change the way the online/offline deployers and the >> JSR88 >> deployment driver work. The first attempt was breaking the TCK amd the >> eclipse plugin. >> >> >> Online deployer, i.e. deployer.jar, boots a Kernel to load its >> dependencies, >> e.g. geronimo-deploy-tool, and registers the available >> ModuleConfigurers with the DeploymentManager. >> >> ModuleConfigurers to be registered are loaded by the persistent >> configuration list jsr88-configurer-config.xml. >> >> In the case of an offline deployment, the online deployer starts the >> offline-deployer configuration within the same Kernel. In turn, the >> offline-deployer configuration starts a list of configurations to >> register the available module builders. >> >> Add a log4j configuration for the online deployer. >> >> DeploymentFactoryBootstrapper is the new JSR88 deployment driver. It >> boots a kernel; starts the configuration list >> jsr88-configurer-config.xml; retrieves >> the "actual" DeploymentFactory implementation from the kernel; and >> delegates >> to this retrieved imoplementation. >> The JSR88 JAR driver is now named jsr88-deploymentfactory.jar. >> >> >> This fixes: >> * GERONIMO-2794 - Improve online deployer to register >> ModuleConfigurers from the repository; and >> * GERONIMO-2767 - Minimize side effects of the offline deployer >> >> Added: >> >> geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/deployer-log4j.properties >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/deployer-log4j.properties >> >> >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/jsr88-configurer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/jsr88-configurer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/jsr88-configurer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/jsr88-configurer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/jsr88-configurer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/jsr88-configurer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/jsr88-configurer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/jsr88-configurer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/jsr88-configurer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/jsr88-configurer-config.xml >> >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml >> >> - copied unchanged from r503370, >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml >> >> geronimo/server/trunk/configs/jsr88-deploymentfactory/ >> geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt >> geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt >> geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/ >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/ >> >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/ >> >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/ >> >> >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar >> >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/ >> >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/ >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/LICENSE.txt >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/NOTICE.txt >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/ >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/test/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/test/java/ >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java >> >> - copied unchanged from r503370, >> geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SwitchablePersistentConfigurationList.java >> >> - copied unchanged from r503370, >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SwitchablePersistentConfigurationList.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/CopyArtifactTypeHandler.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/Maven1Repository.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/Maven2Repository.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/UnpackArtifactTypeHandler.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/Main.java >> >> - copied unchanged from r503370, >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/Main.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainBootstrapper.java >> >> - copied, changed from r503370, >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainBootstrapper.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/Maven1RepositoryTest.java >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/Maven2RepositoryTest.java >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/ >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/ >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/junk/ >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/junk/propertiess/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/junk/propertiess/junk-1.5.properties >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.bar/ >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.bar/propertiess/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.bar/propertiess/test-1.3.properties >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.bar/propertiess/test-1.5.properties >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.foo/ >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.foo/propertiess/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.foo/propertiess/test-2.0.1.properties >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/ >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/junk/ >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/junk/junk/ >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/junk/junk/1.5/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/junk/junk/1.5/junk-1.5.properties >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/ >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/ >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.3/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.3/test-1.3.properties >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.5/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.5/test-1.5.properties >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/foo/ >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/foo/test/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/foo/test/2.0.1/ >> >> >> geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/foo/test/2.0.1/test-2.0.1.properties >> >> >> geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java >> >> - copied unchanged from r503370, >> geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java >> >> >> geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/ServerInfoRootResolver.java >> >> Removed: >> >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list >> >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list >> >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-list >> >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-list >> >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list >> >> >> geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/CopyArtifactTypeHandler.java >> >> >> geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/UnpackArtifactTypeHandler.java >> >> >> geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/repository/ >> >> geronimo/server/trunk/modules/geronimo-system/src/test/repo/ >> Modified: >> >> geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java >> >> geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml >> geronimo/server/trunk/assemblies/geronimo-framework/pom.xml >> >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml >> >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml >> >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml >> >> geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml >> geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml >> geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml >> geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml >> geronimo/server/trunk/configs/jsr88-cli/pom.xml >> geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml >> geronimo/server/trunk/configs/online-deployer/pom.xml >> geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml >> geronimo/server/trunk/configs/pom.xml >> geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml >> >> geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/test/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/AbstractCommand.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java >> >> >> geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java >> >> >> geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java >> >> geronimo/server/trunk/modules/geronimo-kernel/pom.xml >> >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java >> >> geronimo/server/trunk/modules/geronimo-system/pom.xml >> >> geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java >> >> >> geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/Maven1Repository.java >> >> >> geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java >> >> geronimo/server/trunk/modules/pom.xml >> >> Modified: >> geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java >> >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java >> (original) >> +++ >> geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java >> Sat Feb 17 00:01:26 2007 >> @@ -36,6 +36,7 @@ >> import org.apache.commons.logging.Log; >> import org.apache.commons.logging.LogFactory; >> import >> org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl; >> +import >> org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel; >> >> import org.apache.geronimo.gbean.AbstractName; >> import org.apache.geronimo.gbean.GBeanData; >> import org.apache.geronimo.kernel.Kernel; >> @@ -77,6 +78,11 @@ >> // nothing yet >> >> private static ManagementHelper createHelper() { >> + Kernel kernel = getKernel(); >> + return new KernelManagementHelper(kernel); >> + } >> + >> + private static Kernel getKernel() { >> //todo: consider making this configurable; we could easily >> connect to a remote kernel if we wanted to >> Kernel kernel = null; >> try { >> @@ -88,11 +94,12 @@ >> log.debug("Unable to find kernel in JNDI; using >> KernelRegistry instead"); >> kernel = KernelRegistry.getSingleKernel(); >> } >> - return new KernelManagementHelper(kernel); >> + return kernel; >> } >> >> public static DeploymentManager >> getDeploymentManager(PortletRequest request) { >> - DeploymentFactoryImpl factory = new DeploymentFactoryImpl(); >> + Kernel kernel = getKernel(); >> + DeploymentFactoryImpl factory = new >> DeploymentFactoryWithKernel(kernel); >> try { >> return >> factory.getDeploymentManager("deployer:geronimo:inVM", null, null); >> } catch (DeploymentManagerCreationException e) { >> >> Modified: >> geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml >> (original) >> +++ >> geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml >> Sat Feb 17 00:01:26 2007 >> @@ -62,10 +62,6 @@ >> cglib-nodep >> >> >> - commons-cli >> - commons-cli >> - >> - >> commons-logging >> >> commons-logging >> >> @@ -78,10 +74,6 @@ >> mx4j >> >> >> - mx4j >> - mx4j-remote >> - >> - >> xpp3 >> xpp3 >> >> @@ -90,10 +82,6 @@ >> xstream >> >> >> - jline >> - jline >> - >> - >> commons-jexl >> >> commons-jexl >> >> @@ -102,37 +90,28 @@ >> ognl >> >> >> - >> org.apache.geronimo.specs >> - >> geronimo-j2ee-deployment_1.1_spec >> - >> - >> >> org.apache.geronimo.modules >> >> geronimo-common >> ${version} >> >> >> >> org.apache.geronimo.modules >> - >> geronimo-deploy-jsr88 >> - ${version} >> - >> - >> - >> org.apache.geronimo.modules >> - >> geronimo-deploy-tool >> + >> geronimo-kernel >> ${version} >> >> >> >> org.apache.geronimo.modules >> - >> geronimo-kernel >> + >> geronimo-util >> ${version} >> >> >> >> org.apache.geronimo.modules >> - >> geronimo-util >> + >> geronimo-system >> ${version} >> >> >> >> org.apache.geronimo.modules >> - >> geronimo-system >> + >> geronimo-deploy-jsr88-bootstrapper >> ${version} >> >> >> >> Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml >> (original) >> +++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Sat >> Feb 17 00:01:26 2007 >> @@ -90,6 +90,27 @@ >> >> org.apache.geronimo.configs >> + offline-deployer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-cli >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-deploymentfactory >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> unavailable-client-deployer >> ${version} >> car >> @@ -117,7 +138,8 @@ >> >> ${pom.basedir}/src/main/var/config >> >> config.xml >> - offline-deployer-list >> + offline-deployer-config.xml >> + jsr88-configurer-config.xml >> >> true >> >> @@ -197,7 +219,8 @@ >> > todir="${project.build.directory}/scratch"> >> > dir="${project.build.directory}/classes"> >> >> - > name="offline-deployer-list"/> >> + > name="offline-deployer-config.xml"/> >> + > name="jsr88-configurer-config.xml"/> >> >> >> >> >> Modified: >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml >> >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml >> (original) >> +++ >> geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml >> Sat Feb 17 00:01:26 2007 >> @@ -69,6 +69,14 @@ >> >> >> + lib >> + >> jsr88-deploymentfactory.jar >> >> + >> + >> org.apache.geronimo.configs:jsr88-deploymentfactory >> + >> + >> + >> + >> bin >> shutdown.jar >> >> @@ -132,17 +140,11 @@ >> >> target/scratch >> var/config >> - >> - offline-deployer-list >> - >> - >> - - >> - target/scratch >> - var/config >> 0644 >> >> config.xml >> + jsr88-configurer-config.xml >> + offline-deployer-config.xml >> >> >> >> >> Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml >> (original) >> +++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Sat >> Feb 17 00:01:26 2007 >> @@ -207,6 +207,34 @@ >> >> >> org.apache.geronimo.configs >> + online-deployer >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + offline-deployer >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-cli >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-deploymentfactory >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> geronimo-gbean-deployer >> ${version} >> car >> @@ -324,12 +352,33 @@ >> >> org.apache.geronimo.configs >> - online-deployer >> + jsr88-jar-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-rar-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-war-configurer >> ${version} >> car >> >> - >> + >> + org.apache.geronimo.configs >> + jsr88-ear-configurer >> + ${version} >> + car >> + >> + + >> org.apache.geronimo.configs >> openjpa >> ${version} >> @@ -357,14 +406,15 @@ >> >> >> >> ${pom.basedir}/src/main/var/config >> >> config.xml >> - offline-deployer-list >> + offline-deployer-config.xml >> + jsr88-configurer-config.xml >> >> true >> >> @@ -439,7 +489,8 @@ >> > todir="${project.build.directory}/scratch"> >> > dir="${project.build.directory}/classes"> >> >> - > name="offline-deployer-list"/> >> + > name="offline-deployer-config.xml"/> >> + > name="jsr88-configurer-config.xml"/> >> >> >> >> >> Modified: >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml >> >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml >> (original) >> +++ >> geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml >> Sat Feb 17 00:01:26 2007 >> @@ -77,6 +77,14 @@ >> >> >> + lib >> + >> jsr88-deploymentfactory.jar >> >> + >> + >> org.apache.geronimo.configs:jsr88-deploymentfactory >> + >> + >> + + >> bin >> shutdown.jar >> >> @@ -145,17 +153,11 @@ >> >> target/scratch >> var/config >> - >> - offline-deployer-list >> - >> - >> - - >> - target/scratch >> - var/config >> 0644 >> >> config.xml >> + jsr88-configurer-config.xml >> + offline-deployer-config.xml >> >> >> >> >> Modified: >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml >> (original) >> +++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml >> Sat Feb 17 00:01:26 2007 >> @@ -94,7 +94,7 @@ >> ${version} >> car >> >> - + >> >> org.apache.geronimo.configs >> remote-deploy-jetty >> @@ -125,6 +125,48 @@ >> >> >> org.apache.geronimo.configs >> + offline-deployer >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-cli >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-deploymentfactory >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-rar-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-war-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-ear-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> unavailable-client-deployer >> ${version} >> car >> @@ -159,7 +201,8 @@ >> >> ${pom.basedir}/src/main/var/config >> >> config.xml >> - offline-deployer-list >> + offline-deployer-config.xml >> + jsr88-configurer-config.xml >> >> true >> >> @@ -234,7 +277,8 @@ >> > todir="${project.build.directory}/scratch"> >> > dir="${project.build.directory}/classes"> >> >> - > name="offline-deployer-list"/> >> + > name="offline-deployer-config.xml"/> >> + > name="jsr88-configurer-config.xml"/> >> >> >> >> >> Modified: >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml >> >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml >> (original) >> +++ >> geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml >> Sat Feb 17 00:01:26 2007 >> @@ -69,6 +69,14 @@ >> >> >> + lib >> + >> jsr88-deploymentfactory.jar >> >> + >> + >> org.apache.geronimo.configs:jsr88-deploymentfactory >> + >> + >> + + >> bin >> shutdown.jar >> >> @@ -132,17 +140,11 @@ >> >> target/scratch >> var/config >> - >> - offline-deployer-list >> - >> - >> - - >> - target/scratch >> - var/config >> 0644 >> >> config.xml >> + jsr88-configurer-config.xml >> + offline-deployer-config.xml >> >> >> >> >> Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml >> (original) >> +++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Sat >> Feb 17 00:01:26 2007 >> @@ -322,7 +322,56 @@ >> car >> >> >> - >> + >> + org.apache.geronimo.configs >> + offline-deployer >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-cli >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-deploymentfactory >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-jar-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-rar-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-war-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-ear-configurer >> + ${version} >> + car >> + >> + >> + >> org.apache.geronimo.configs >> openjpa >> ${version} >> @@ -337,7 +386,8 @@ >> >> ${pom.basedir}/src/main/var/config >> >> config.xml >> - offline-deployer-list >> + offline-deployer-config.xml >> + jsr88-configurer-config.xml >> >> true >> >> @@ -412,7 +462,8 @@ >> > todir="${project.build.directory}/scratch"> >> > dir="${project.build.directory}/classes"> >> >> - > name="offline-deployer-list"/> >> + > name="offline-deployer-config.xml"/> >> + > name="jsr88-configurer-config.xml"/> >> >> >> >> >> Modified: >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml >> >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml >> (original) >> +++ >> geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml >> Sat Feb 17 00:01:26 2007 >> @@ -77,6 +77,14 @@ >> >> >> + lib >> + >> jsr88-deploymentfactory.jar >> >> + >> + >> org.apache.geronimo.configs:jsr88-deploymentfactory >> + >> + >> + >> + >> bin >> shutdown.jar >> >> @@ -145,17 +153,11 @@ >> >> target/scratch >> var/config >> - >> - offline-deployer-list >> - >> - >> - - >> - target/scratch >> - var/config >> 0644 >> >> config.xml >> + jsr88-configurer-config.xml >> + offline-deployer-config.xml >> >> >> >> >> Modified: >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml >> (original) >> +++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml >> Sat Feb 17 00:01:26 2007 >> @@ -122,6 +122,48 @@ >> ${version} >> car >> >> + >> + >> + org.apache.geronimo.configs >> + offline-deployer >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-cli >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-deploymentfactory >> + ${version} >> + car >> + >> + >> + >> + org.apache.geronimo.configs >> + jsr88-rar-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-war-configurer >> + ${version} >> + car >> + >> + + >> + org.apache.geronimo.configs >> + jsr88-ear-configurer >> + ${version} >> + car >> + >> >> org.apache.geronimo.configs >> @@ -159,7 +201,8 @@ >> >> ${pom.basedir}/src/main/var/config >> >> config.xml >> - offline-deployer-list >> + offline-deployer-config.xml >> + jsr88-configurer-config.xml >> >> true >> >> @@ -234,7 +277,8 @@ >> > todir="${project.build.directory}/scratch"> >> > dir="${project.build.directory}/classes"> >> >> - > name="offline-deployer-list"/> >> + > name="offline-deployer-config.xml"/> >> + > name="jsr88-configurer-config.xml"/> >> >> >> >> >> Modified: >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml >> >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml >> (original) >> +++ >> geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml >> Sat Feb 17 00:01:26 2007 >> @@ -67,6 +67,14 @@ >> >> org.apache.geronimo.configs:online-deployer >> >> >> + >> + >> + lib >> + >> jsr88-deploymentfactory.jar >> >> + >> + >> org.apache.geronimo.configs:jsr88-deploymentfactory >> + >> + >> >> bin >> @@ -132,17 +140,11 @@ >> >> target/scratch >> var/config >> - >> - offline-deployer-list >> - >> - >> - - >> - target/scratch >> - var/config >> 0644 >> >> config.xml >> + jsr88-configurer-config.xml >> + offline-deployer-config.xml >> >> >> >> >> Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml >> (original) >> +++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml >> Sat Feb 17 00:01:26 2007 >> @@ -89,9 +89,6 @@ >> >> >> >> - >> - > class="org.apache.geronimo.client.builder.jsr88.ClientConfigurer"/> >> - >> > class="org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder"> >> > name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee >> >> >> >> Modified: >> geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml >> (original) >> +++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml >> Sat Feb 17 00:01:26 2007 >> @@ -85,6 +85,4 @@ >> > name="eeNamespaces">http://java.sun.com/xml/ns/j2ee >> >> >> - > class="org.apache.geronimo.connector.deployment.RARConfigurer"/> >> - >> >> >> Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml >> (original) >> +++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Sat >> Feb 17 00:01:26 2007 >> @@ -142,8 +142,6 @@ >> > name="eeNamespaces">http://java.sun.com/xml/ns/j2ee >> >> >> - > class="org.apache.geronimo.j2ee.jsr88.EARConfigurer"/> >> - >> > class="org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder"> >> > name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee >> >> >> >> Modified: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml >> (original) >> +++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml >> Sat Feb 17 00:01:26 2007 >> @@ -128,6 +128,4 @@ >> dummy >> >> >> - > class="org.apache.geronimo.web.deployment.WARConfigurer"/> >> - >> >> >> Modified: geronimo/server/trunk/configs/jsr88-cli/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/jsr88-cli/pom.xml (original) >> +++ geronimo/server/trunk/configs/jsr88-cli/pom.xml Sat Feb 17 >> 00:01:26 2007 >> @@ -40,7 +40,7 @@ >> geronimo-deploy-jsr88 >> ${version} >> >> - + >> >> org.apache.geronimo.modules >> geronimo-deploy-tool >> @@ -56,6 +56,16 @@ >> >> org.apache.geronimo.specs >> geronimo-j2ee-deployment_1.1_spec >> + >> + >> + >> + commons-cli >> + commons-cli >> + >> + >> + >> + jline >> + jline >> >> >> >> >> Modified: geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml (original) >> +++ geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml Sat Feb >> 17 00:01:26 2007 >> @@ -20,7 +20,13 @@ >> >> > xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"> >> >> >> - > class="org.apache.geronimo.deployment.cli.DeployTool" /> >> + > class="org.apache.geronimo.deployment.cli.DeployTool" > >> + >> + DeploymentFactory >> + >> + >> + >> + > class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" >> /> >> >> > class="org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager"> >> >> >> >> Added: geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt?view=auto&rev=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt >> (added) >> +++ geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt >> Sat Feb 17 00:01:26 2007 >> @@ -0,0 +1,203 @@ >> + >> + Apache License >> + Version 2.0, January 2004 >> + http://www.apache.org/licenses/ >> + >> + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION >> + >> + 1. Definitions. >> + >> + "License" shall mean the terms and conditions for use, >> reproduction, >> + and distribution as defined by Sections 1 through 9 of this >> document. >> + >> + "Licensor" shall mean the copyright owner or entity authorized by >> + the copyright owner that is granting the License. >> + >> + "Legal Entity" shall mean the union of the acting entity and all >> + other entities that control, are controlled by, or are under >> common >> + control with that entity. For the purposes of this definition, >> + "control" means (i) the power, direct or indirect, to cause the >> + direction or management of such entity, whether by contract or >> + otherwise, or (ii) ownership of fifty percent (50%) or more of the >> + outstanding shares, or (iii) beneficial ownership of such entity. >> + >> + "You" (or "Your") shall mean an individual or Legal Entity >> + exercising permissions granted by this License. >> + >> + "Source" form shall mean the preferred form for making >> modifications, >> + including but not limited to software source code, documentation >> + source, and configuration files. >> + >> + "Object" form shall mean any form resulting from mechanical >> + transformation or translation of a Source form, including but >> + not limited to compiled object code, generated documentation, >> + and conversions to other media types. >> + >> + "Work" shall mean the work of authorship, whether in Source or >> + Object form, made available under the License, as indicated by a >> + copyright notice that is included in or attached to the work >> + (an example is provided in the Appendix below). >> + >> + "Derivative Works" shall mean any work, whether in Source or >> Object >> + form, that is based on (or derived from) the Work and for which >> the >> + editorial revisions, annotations, elaborations, or other >> modifications >> + represent, as a whole, an original work of authorship. For the >> purposes >> + of this License, Derivative Works shall not include works that >> remain >> + separable from, or merely link (or bind by name) to the >> interfaces of, >> + the Work and Derivative Works thereof. >> + >> + "Contribution" shall mean any work of authorship, including >> + the original version of the Work and any modifications or >> additions >> + to that Work or Derivative Works thereof, that is intentionally >> + submitted to Licensor for inclusion in the Work by the >> copyright owner >> + or by an individual or Legal Entity authorized to submit on >> behalf of >> + the copyright owner. For the purposes of this definition, >> "submitted" >> + means any form of electronic, verbal, or written communication >> sent >> + to the Licensor or its representatives, including but not >> limited to >> + communication on electronic mailing lists, source code control >> systems, >> + and issue tracking systems that are managed by, or on behalf >> of, the >> + Licensor for the purpose of discussing and improving the Work, but >> + excluding communication that is conspicuously marked or otherwise >> + designated in writing by the copyright owner as "Not a >> Contribution." >> + >> + "Contributor" shall mean Licensor and any individual or Legal >> Entity >> + on behalf of whom a Contribution has been received by Licensor and >> + subsequently incorporated within the Work. >> + >> + 2. Grant of Copyright License. Subject to the terms and conditions of >> + this License, each Contributor hereby grants to You a perpetual, >> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable >> + copyright license to reproduce, prepare Derivative Works of, >> + publicly display, publicly perform, sublicense, and distribute the >> + Work and such Derivative Works in Source or Object form. >> + >> + 3. Grant of Patent License. Subject to the terms and conditions of >> + this License, each Contributor hereby grants to You a perpetual, >> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable >> + (except as stated in this section) patent license to make, have >> made, >> + use, offer to sell, sell, import, and otherwise transfer the Work, >> + where such license applies only to those patent claims licensable >> + by such Contributor that are necessarily infringed by their >> + Contribution(s) alone or by combination of their Contribution(s) >> + with the Work to which such Contribution(s) was submitted. If You >> + institute patent litigation against any entity (including a >> + cross-claim or counterclaim in a lawsuit) alleging that the Work >> + or a Contribution incorporated within the Work constitutes direct >> + or contributory patent infringement, then any patent licenses >> + granted to You under this License for that Work shall terminate >> + as of the date such litigation is filed. >> + >> + 4. Redistribution. You may reproduce and distribute copies of the >> + Work or Derivative Works thereof in any medium, with or without >> + modifications, and in Source or Object form, provided that You >> + meet the following conditions: >> + >> + (a) You must give any other recipients of the Work or >> + Derivative Works a copy of this License; and >> + >> + (b) You must cause any modified files to carry prominent notices >> + stating that You changed the files; and >> + >> + (c) You must retain, in the Source form of any Derivative Works >> + that You distribute, all copyright, patent, trademark, and >> + attribution notices from the Source form of the Work, >> + excluding those notices that do not pertain to any part of >> + the Derivative Works; and >> + >> + (d) If the Work includes a "NOTICE" text file as part of its >> + distribution, then any Derivative Works that You distribute >> must >> + include a readable copy of the attribution notices contained >> + within such NOTICE file, excluding those notices that do not >> + pertain to any part of the Derivative Works, in at least one >> + of the following places: within a NOTICE text file distributed >> + as part of the Derivative Works; within the Source form or >> + documentation, if provided along with the Derivative Works; >> or, >> + within a display generated by the Derivative Works, if and >> + wherever such third-party notices normally appear. The >> contents >> + of the NOTICE file are for informational purposes only and >> + do not modify the License. You may add Your own attribution >> + notices within Derivative Works that You distribute, alongside >> + or as an addendum to the NOTICE text from the Work, provided >> + that such additional attribution notices cannot be construed >> + as modifying the License. >> + >> + You may add Your own copyright statement to Your modifications and >> + may provide additional or different license terms and conditions >> + for use, reproduction, or distribution of Your modifications, or >> + for any such Derivative Works as a whole, provided Your use, >> + reproduction, and distribution of the Work otherwise complies with >> + the conditions stated in this License. >> + >> + 5. Submission of Contributions. Unless You explicitly state >> otherwise, >> + any Contribution intentionally submitted for inclusion in the Work >> + by You to the Licensor shall be under the terms and conditions of >> + this License, without any additional terms or conditions. >> + Notwithstanding the above, nothing herein shall supersede or >> modify >> + the terms of any separate license agreement you may have executed >> + with Licensor regarding such Contributions. >> + >> + 6. Trademarks. This License does not grant permission to use the >> trade >> + names, trademarks, service marks, or product names of the >> Licensor, >> + except as required for reasonable and customary use in >> describing the >> + origin of the Work and reproducing the content of the NOTICE file. >> + >> + 7. Disclaimer of Warranty. Unless required by applicable law or >> + agreed to in writing, Licensor provides the Work (and each >> + Contributor provides its Contributions) on an "AS IS" BASIS, >> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or >> + implied, including, without limitation, any warranties or >> conditions >> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A >> + PARTICULAR PURPOSE. You are solely responsible for determining the >> + appropriateness of using or redistributing the Work and assume any >> + risks associated with Your exercise of permissions under this >> License. >> + >> + 8. Limitation of Liability. In no event and under no legal theory, >> + whether in tort (including negligence), contract, or otherwise, >> + unless required by applicable law (such as deliberate and grossly >> + negligent acts) or agreed to in writing, shall any Contributor be >> + liable to You for damages, including any direct, indirect, >> special, >> + incidental, or consequential damages of any character arising as a >> + result of this License or out of the use or inability to use the >> + Work (including but not limited to damages for loss of goodwill, >> + work stoppage, computer failure or malfunction, or any and all >> + other commercial damages or losses), even if such Contributor >> + has been advised of the possibility of such damages. >> + >> + 9. Accepting Warranty or Additional Liability. While redistributing >> + the Work or Derivative Works thereof, You may choose to offer, >> + and charge a fee for, acceptance of support, warranty, indemnity, >> + or other liability obligations and/or rights consistent with this >> + License. However, in accepting such obligations, You may act only >> + on Your own behalf and on Your sole responsibility, not on behalf >> + of any other Contributor, and only if You agree to indemnify, >> + defend, and hold each Contributor harmless for any liability >> + incurred by, or claims asserted against, such Contributor by >> reason >> + of your accepting any such warranty or additional liability. >> + >> + END OF TERMS AND CONDITIONS >> + >> + APPENDIX: How to apply the Apache License to your work. >> + >> + To apply the Apache License to your work, attach the following >> + boilerplate notice, with the fields enclosed by brackets "[]" >> + replaced with your own identifying information. (Don't include >> + the brackets!) The text should be enclosed in the appropriate >> + comment syntax for the file format. We also recommend that a >> + file or class name and description of purpose be included on the >> + same "printed page" as the copyright notice for easier >> + identification within third-party archives. >> + >> + Copyright [yyyy] [name of copyright owner] >> + >> + Licensed 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. >> + >> >> Added: geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt?view=auto&rev=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt >> (added) >> +++ geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt >> Sat Feb 17 00:01:26 2007 >> @@ -0,0 +1,6 @@ >> +Apache Geronimo +Copyright 2003-2006 The Apache Software Foundation >> + >> +This product includes software developed by >> +The Apache Software Foundation (http://www.apache.org/). >> + >> >> Added: geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml?view=auto&rev=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml (added) >> +++ geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml Sat >> Feb 17 00:01:26 2007 >> @@ -0,0 +1,94 @@ >> + >> + >> + >> + >> + >> +> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 >> http://maven.apache.org/maven-v4_0_0.xsd"> >> + >> + 4.0.0 >> + >> + >> + org.apache.geronimo.configs >> + configs >> + 2.0-SNAPSHOT >> + ../pom.xml >> + >> + >> + jsr88-deploymentfactory >> + Geronimo Configs :: JSR88 DeploymentFactory >> + car >> + >> + >> + >> + >> + org.apache.geronimo.plugins >> + car-maven-plugin >> + >> + >> + >> + >> org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryBootstrapper >> >> + >> + >> + >> + >> + >> + >> + >> org.apache.geronimo.modules >> + geronimo-kernel >> + ${version} >> + >> + >> + >> org.apache.geronimo.modules >> + >> geronimo-deploy-jsr88-bootstrapper >> + ${version} >> + >> + >> + mx4j >> + mx4j >> + >> + >> + commons-logging >> + commons-logging >> + >> + >> + cglib >> + cglib-nodep >> + >> + >> + log4j >> + log4j >> + >> + >> + xpp3 >> + xpp3 >> + >> + >> + xstream >> + xstream >> + >> + >> + ../lib >> + >> + >> + >> + >> + >> + >> + >> >> Added: >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar >> >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar?view=auto&rev=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar >> (added) >> +++ >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar >> Sat Feb 17 00:01:26 2007 >> @@ -0,0 +1,18 @@ >> + >> +This file tells the Geronimo bootstrap where to look for its >> installation >> +directory, which is ../ from wherever the jar containing this file >> lives. >> \ No newline at end of file >> >> Added: >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml?view=auto&rev=508724 >> >> ============================================================================== >> >> --- >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml >> (added) >> +++ >> geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml >> Sat Feb 17 00:01:26 2007 >> @@ -0,0 +1,94 @@ >> + >> + >> + >> + >> + >> +> xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"> >> >> + >> + >> + > class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/> >> + >> + >> + > class="org.apache.geronimo.system.repository.Maven2Repository"> >> + repository/ >> + >> + ServerInfo >> + >> + >> + >> + >> + > class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore"> >> >> + >> + Repository >> + >> + >> + >> + >> + > class="org.apache.geronimo.system.configuration.LocalAttributeManager"> >> + >> + ServerInfo >> + >> + true >> + > name="configFile">var/config/jsr88-configurer-config.xml >> + >> + >> + >> + > class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/> >> + >> + >> + > class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver"> >> >> + >> + ArtifactManager >> + >> + >> + > name="versionMapLocation">var/config/artifact_aliases.properties >> >> + >> + ServerInfo >> + >> + >> + >> + >> + > class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager"> >> >> + >> + >> + >> + >> + AttributeManager >> + >> + >> + AttributeStore >> + AttributeManager >> + >> + >> + ArtifactManager >> + >> + >> + ArtifactResolver >> + >> + >> + >> + >> + > class="org.apache.geronimo.system.logging.log4j.Log4jService"> >> + > name="configFileName">var/log/deployer-log4j.properties >> + 60 >> + >> + ServerInfo >> + >> + >> + >> + >> >> Modified: geronimo/server/trunk/configs/online-deployer/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/online-deployer/pom.xml (original) >> +++ geronimo/server/trunk/configs/online-deployer/pom.xml Sat Feb 17 >> 00:01:26 2007 >> @@ -45,7 +45,7 @@ >> lib/ext >> >> >> - >> org.apache.geronimo.deployment.cli.DeployTool >> + >> org.apache.geronimo.kernel.util.MainBootstrapper >> >> >> >> @@ -55,51 +55,14 @@ >> >> >> >> org.apache.geronimo.modules >> - geronimo-common >> - ${version} >> - >> - >> - >> org.apache.geronimo.modules >> geronimo-kernel >> ${version} >> >> >> - >> org.apache.geronimo.modules >> - geronimo-system >> - ${version} >> - >> - >> - >> org.apache.geronimo.modules >> - geronimo-util >> - ${version} >> - >> - >> - >> org.apache.geronimo.modules >> - >> geronimo-deploy-jsr88 >> - ${version} >> - >> - >> - >> org.apache.geronimo.modules >> - >> geronimo-deploy-tool >> - ${version} >> - >> - >> - org.apache.geronimo.specs >> - >> geronimo-j2ee-deployment_1.1_spec >> - >> - >> mx4j >> mx4j >> >> >> - mx4j >> - mx4j-remote >> - >> - >> - commons-cli >> - commons-cli >> - >> - >> commons-logging >> commons-logging >> >> @@ -110,10 +73,6 @@ >> >> log4j >> log4j >> - >> - >> - jline >> - jline >> >> >> xpp3 >> >> Modified: geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml >> (original) >> +++ geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml >> Sat Feb 17 00:01:26 2007 >> @@ -19,5 +19,84 @@ >> >> >> > xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"> >> >> - >> + >> + >> + > class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/> >> + >> + >> + > class="org.apache.geronimo.system.repository.Maven2Repository"> >> + repository/ >> + >> + ServerInfo >> + >> + >> + >> + >> + > class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore"> >> >> + >> + Repository >> + >> + >> + >> + >> + > class="org.apache.geronimo.system.configuration.LocalAttributeManager"> >> + >> + ServerInfo >> + >> + true >> + > name="configFile">var/config/jsr88-configurer-config.xml >> + >> + >> + >> + > class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/> >> + >> + >> + > class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver"> >> >> + >> + ArtifactManager >> + >> + >> + > name="versionMapLocation">var/config/artifact_aliases.properties >> >> + >> + ServerInfo >> + >> + >> + >> + >> + > class="org.apache.geronimo.system.configuration.SwitchableLocalAttributeManager"> >> >> + >> + ServerInfo >> + >> + var/config/config.xml >> + >> + >> + >> + > class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager"> >> >> + >> + >> + >> + >> + AttributeManager >> + >> + >> + AttributeStore >> + ServerAttributeManager >> + >> + >> + ArtifactManager >> + >> + >> + ArtifactResolver >> + >> + >> + >> + >> + > class="org.apache.geronimo.system.logging.log4j.Log4jService"> >> + > name="configFileName">var/log/deployer-log4j.properties >> + 60 >> + >> + ServerInfo >> + >> + >> + >> >> >> Modified: geronimo/server/trunk/configs/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/configs/pom.xml (original) >> +++ geronimo/server/trunk/configs/pom.xml Sat Feb 17 00:01:26 2007 >> @@ -129,9 +129,16 @@ >> javamail >> jsp-examples-jetty >> jsp-examples-tomcat >> + jsr88-cli >> + jsr88-deploymentfactory >> + jsr88-jar-configurer >> + jsr88-rar-configurer >> + jsr88-war-configurer >> + jsr88-ear-configurer >> ldap-demo-jetty >> ldap-demo-tomcat >> ldap-realm >> + offline-deployer >> online-deployer >> openejb >> openejb-corba-deployer >> >> Modified: >> geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml?view=diff&rev=508724&r1=508723&r2=508724 >> >> ============================================================================== >> >> --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml >> (original) >> +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml >> Sat Feb 17 00:01:26 2007 >> @@ -43,6 +43,13 @@ >> >> >> >> + org.apache.geronimo.configs >> + jsr88-deploymentfactory >> + ${version} >> + car >> + >> + >> + >> org.apache.geronimo.modules >> geronimo-deploy-jsr88 >> ${version} >> >> >> >