Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 52471 invoked from network); 5 May 2008 22:47:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 May 2008 22:47:16 -0000 Received: (qmail 25106 invoked by uid 500); 5 May 2008 22:47:18 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 25065 invoked by uid 500); 5 May 2008 22:47:17 -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 25049 invoked by uid 99); 5 May 2008 22:47:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 May 2008 15:47:17 -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, 05 May 2008 22:46:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5BD0A2388A1F; Mon, 5 May 2008 15:46:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r653621 - /geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java Date: Mon, 05 May 2008 22:46:53 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080505224653.5BD0A2388A1F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon May 5 15:46:51 2008 New Revision: 653621 URL: http://svn.apache.org/viewvc?rev=653621&view=rev Log: pass the right filename when doing remote deployment or remote library installation (GERONIMO-3999) Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java?rev=653621&r1=653620&r2=653621&view=diff ============================================================================== --- geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java (original) +++ geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java Mon May 5 15:46:51 2008 @@ -242,7 +242,9 @@ } PluginInstaller installer = getPluginInstaller(); try { - return installer.startInstall(carFile, defaultRepository, restrictToDefaultRepository, username, password); + // make sure to pass args[0] as RemoteDeployUtil.uploadFilesToServer will update + // the args argument with the filenames returned from the server + return installer.startInstall(args[0], defaultRepository, restrictToDefaultRepository, username, password); } finally { kernel.getProxyManager().destroyProxy(installer); } @@ -339,7 +341,9 @@ Set set = kernel.listGBeans(new AbstractNameQuery(PluginInstaller.class.getName())); for (AbstractName name : set) { PluginInstaller installer = (PluginInstaller) kernel.getProxyManager().createProxy(name, PluginInstaller.class); - Artifact artifact = installer.installLibrary(libFile, groupId); + // make sure to pass args[0] as RemoteDeployUtil.uploadFilesToServer will update + // the args argument with the filenames returned from the server + Artifact artifact = installer.installLibrary(args[0], groupId); kernel.getProxyManager().destroyProxy(installer); return artifact; }