Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 83294 invoked from network); 28 Jun 2005 06:28:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Jun 2005 06:28:09 -0000 Received: (qmail 48375 invoked by uid 500); 28 Jun 2005 06:28:08 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 48355 invoked by uid 500); 28 Jun 2005 06:28:07 -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 48341 invoked by uid 99); 28 Jun 2005 06:28:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2005 23:28:07 -0700 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 27 Jun 2005 23:28:06 -0700 Received: (qmail 83285 invoked by uid 65534); 28 Jun 2005 06:28:04 -0000 Message-ID: <20050628062804.83284.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r202138 - in /geronimo/trunk/modules: deploy-config/src/java/org/apache/geronimo/deployment/ deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/ deployment/src/java/o... Date: Tue, 28 Jun 2005 06:28:04 -0000 To: scm@geronimo.apache.org From: ammulder@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ammulder Date: Mon Jun 27 23:28:03 2005 New Revision: 202138 URL: http://svn.apache.org/viewcvs?rev=202138&view=rev Log: One more relocation (ModuleConfigurer interface) Update JavaDoc on deployer Change DeploymentManagers to use the existing XYZConfigurers Added: geronimo/trunk/modules/deploy-config/src/java/org/apache/geronimo/deployment/ModuleConfigurer.java - copied unchanged from r202124, geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ModuleConfigurer.java Removed: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ModuleConfigurer.java Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java?rev=202138&r1=202137&r2=202138&view=diff ============================================================================== --- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java (original) +++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java Mon Jun 27 23:28:03 2005 @@ -30,6 +30,9 @@ import java.util.Locale; import java.io.File; import java.io.InputStream; +import org.apache.geronimo.connector.deployment.RARConfigurer; +import org.apache.geronimo.jetty.deployment.WARConfigurer; +import org.openejb.deployment.EJBConfigurer; /** * Implementation of a disconnected JSR88 DeploymentManager. @@ -40,6 +43,18 @@ public class DisconnectedDeploymentManager implements DeploymentManager { public DeploymentConfiguration createConfiguration(DeployableObject dObj) throws InvalidModuleException { + if(dObj.getType().equals(ModuleType.CAR)) { + //todo: need a client configurer + } else if(dObj.getType().equals(ModuleType.EAR)) { + //todo: need an EAR configurer + } else if(dObj.getType().equals(ModuleType.EJB)) { + return new EJBConfigurer().createConfiguration(dObj); + } else if(dObj.getType().equals(ModuleType.RAR)) { + return new RARConfigurer().createConfiguration(dObj); + } else if(dObj.getType().equals(ModuleType.WAR)) { + return new WARConfigurer().createConfiguration(dObj); // this is jetty + // todo: Tomcat WARConfigurer + } throw new InvalidModuleException("Not supported"); } Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?rev=202138&r1=202137&r2=202138&view=diff ============================================================================== --- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original) +++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Mon Jun 27 23:28:03 2005 @@ -52,6 +52,9 @@ import org.apache.geronimo.kernel.jmx.KernelDelegate; import org.apache.geronimo.kernel.management.State; import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.connector.deployment.RARConfigurer; +import org.apache.geronimo.jetty.deployment.WARConfigurer; +import org.openejb.deployment.EJBConfigurer; /** @@ -268,6 +271,18 @@ } public DeploymentConfiguration createConfiguration(DeployableObject dObj) throws InvalidModuleException { + if(dObj.getType().equals(ModuleType.CAR)) { + //todo: need a client configurer + } else if(dObj.getType().equals(ModuleType.EAR)) { + //todo: need an EAR configurer + } else if(dObj.getType().equals(ModuleType.EJB)) { + return new EJBConfigurer().createConfiguration(dObj); + } else if(dObj.getType().equals(ModuleType.RAR)) { + return new RARConfigurer().createConfiguration(dObj); + } else if(dObj.getType().equals(ModuleType.WAR)) { + return new WARConfigurer().createConfiguration(dObj); // this is jetty + // todo: Tomcat WARConfigurer + } throw new InvalidModuleException("Not supported"); } Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java?rev=202138&r1=202137&r2=202138&view=diff ============================================================================== --- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java (original) +++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java Mon Jun 27 23:28:03 2005 @@ -41,8 +41,7 @@ import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil; /** - * Command line based deployment utility which combines multiple deployable modules - * into a single configuration. + * GBean that knows how to deploy modules (by consulting available module builders) * * @version $Rev$ $Date$ */