Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75BA5D7FC for ; Wed, 11 Jul 2012 02:31:42 +0000 (UTC) Received: (qmail 75050 invoked by uid 500); 11 Jul 2012 02:31:42 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 74975 invoked by uid 500); 11 Jul 2012 02:31:42 -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 74962 invoked by uid 99); 11 Jul 2012 02:31:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2012 02:31:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 11 Jul 2012 02:31:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 513F9238889B; Wed, 11 Jul 2012 02:31:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1359993 - /geronimo/server/branches/3.0/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java Date: Wed, 11 Jul 2012 02:31:21 -0000 To: scm@geronimo.apache.org From: violalu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120711023121.513F9238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: violalu Date: Wed Jul 11 02:31:20 2012 New Revision: 1359993 URL: http://svn.apache.org/viewvc?rev=1359993&view=rev Log: GERONIMO-6370 revert unnessary changes in ExtendedDeploymentManager Modified: geronimo/server/branches/3.0/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java Modified: geronimo/server/branches/3.0/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java?rev=1359993&r1=1359992&r2=1359993&view=diff ============================================================================== --- geronimo/server/branches/3.0/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java (original) +++ geronimo/server/branches/3.0/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java Wed Jul 11 02:31:20 2012 @@ -308,8 +308,8 @@ public abstract class ExtendedDeployment /** * Only support local bundle update */ - public boolean hotSwapEBAContent(AbstractName applicationGBeanName, long bundleId, File changesDir, boolean updateArchive) throws Exception { - Object[] arguments = new Object[] {bundleId, changesDir, updateArchive}; + public boolean hotSwapEBAContent(AbstractName applicationGBeanName, long bundleId, File changesFile, boolean updateArchive) throws Exception { + Object[] arguments = new Object[] {bundleId, changesFile, updateArchive}; String[] argumentTypes = new String[] {long.class.getName(), File.class.getName(), boolean.class.getName()}; return (Boolean) kernel.invoke(applicationGBeanName, "hotSwapApplicationContent", arguments, argumentTypes); }