Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 57380 invoked from network); 16 Apr 2006 01:24:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Apr 2006 01:24:26 -0000 Received: (qmail 57574 invoked by uid 500); 16 Apr 2006 01:24:25 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 57565 invoked by uid 500); 16 Apr 2006 01:24:25 -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 57554 invoked by uid 99); 16 Apr 2006 01:24:25 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Apr 2006 18:24:25 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,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; Sat, 15 Apr 2006 18:24:24 -0700 Received: (qmail 57164 invoked by uid 65534); 16 Apr 2006 01:24:04 -0000 Message-ID: <20060416012404.57163.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r394422 - in /geronimo/branches/1.1/modules: deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/ deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/ deploy-tool/src/java/org/apache/geronimo/deployment/cli/ Date: Sun, 16 Apr 2006 01:24:03 -0000 To: scm@geronimo.apache.org From: gdamour@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: gdamour Date: Sat Apr 15 18:24:00 2006 New Revision: 394422 URL: http://svn.apache.org/viewcvs?rev=394422&view=rev Log: Attempt to address Aaron's -1: -1 to this change: the DeploymentManager can be used for many operations in succession, and as written, the in-place flag is persistent once set, whereas it my opinion in should only apply to a single operation and if you do another deployment on the same deployment manager you should need to specify the flag each time if you want it each time Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java?rev=394422&r1=394421&r2=394422&view=diff ============================================================================== --- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java (original) +++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java Sat Apr 15 18:24:00 2006 @@ -39,6 +39,14 @@ this.inPlace = inPlace; } + public CommandContext(CommandContext prototype) { + this.logErrors = prototype.logErrors; + this.verbose = prototype.verbose; + this.username = prototype.username; + this.password = prototype.password; + this.inPlace = prototype.inPlace; + } + public boolean isLogErrors() { return logErrors; } Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java?rev=394422&r1=394421&r2=394422&view=diff ============================================================================== --- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java (original) +++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java Sat Apr 15 18:24:00 2006 @@ -247,7 +247,7 @@ } public void setCommandContext(CommandContext commandContext) { - this.commandContext = commandContext; + this.commandContext = new CommandContext(commandContext); } public static ModuleType convertModuleType(ConfigurationModuleType type) { Modified: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java?rev=394422&r1=394421&r2=394422&view=diff ============================================================================== --- geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java (original) +++ geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java Sat Apr 15 18:24:00 2006 @@ -63,9 +63,15 @@ "Cannot perform in-place deployment."); } JMXDeploymentManager jmxMgr = (JMXDeploymentManager) mgr; - jmxMgr.setInPlace(true); + try { + jmxMgr.setInPlace(true); + return mgr.distribute(tlist, module, plan); + } finally { + jmxMgr.setInPlace(false); + } + } else { + return mgr.distribute(tlist, module, plan); } - return mgr.distribute(tlist, module, plan); } protected String getAction() {