Re: svn commit: r653620 - /geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java

[Gianny Damour]

Hi,

It would be preferable to have tests instead of in-lined comments.

Thanks,
Gianny

On 06/05/2008, at 8:46 AM, [EMAIL PROTECTED] wrote:

Author: gawor
Date: Mon May  5 15:46:11 2008
New Revision: 653620

URL: http://svn.apache.org/viewvc?rev=653620&view=rev
Log:

pass the right filename when doing remote deployment or remote library installation (GERONIMO-3999)

Modified:

geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/ src/main/java/org/apache/geronimo/deployment/plugin/jmx/ RemoteDeploymentManager.java

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy- jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ RemoteDeploymentManager.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/ modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/ deployment/plugin/jmx/RemoteDeploymentManager.java? rev=653620&r1=653619&r2=653620&view=diff ====================================================================== ======== --- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/ src/main/java/org/apache/geronimo/deployment/plugin/jmx/ RemoteDeploymentManager.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/ src/main/java/org/apache/geronimo/deployment/plugin/jmx/ RemoteDeploymentManager.java Mon May 5 15:46:11 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<AbstractName> 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;
         }