geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1032489 - /geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/AssembleServerCommand.java
Date Mon, 08 Nov 2010 08:30:07 GMT
Author: xuhaihong
Date: Mon Nov  8 08:30:07 2010
New Revision: 1032489

URL: http://svn.apache.org/viewvc?rev=1032489&view=rev
Log:
GERONIMO-5614 problem with "deploy:assemble-server" gogo command

Modified:
    geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/AssembleServerCommand.java

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/AssembleServerCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/AssembleServerCommand.java?rev=1032489&r1=1032488&r2=1032489&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/AssembleServerCommand.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/AssembleServerCommand.java
Mon Nov  8 08:30:07 2010
@@ -110,7 +110,7 @@ public class AssembleServerCommand exten
 
         if (pluginArtifacts != null) {
             command.assembleServer((GeronimoDeploymentManager)connection.getDeploymentManager(),
pluginArtifacts, plugins, "repository", relativeServerPath, this);
-            ((GeronimoDeploymentManager)connection.getDeploymentManager()).archive(relativeServerPath,
"var/temp", new Artifact(group, artifact, (String)version, format));
+            ((GeronimoDeploymentManager)connection.getDeploymentManager()).archive(relativeServerPath,
"var/temp", new Artifact(group, artifact, version, format));
         } else {
             PluginListType pluginsToInstall;
 
@@ -144,9 +144,9 @@ public class AssembleServerCommand exten
                 pluginsToInstall = command.getInstallList(plugins, this, null);
             }
 
-            if (pluginsToInstall == null) {
-                command.assembleServer((GeronimoDeploymentManager)connection.getDeploymentManager(),
pluginsToInstall, "repository", relativeServerPath, this);
-                ((GeronimoDeploymentManager)connection.getDeploymentManager()).archive(relativeServerPath,
"var/temp", new Artifact(group, artifact, (String)version, format));
+            if (pluginsToInstall != null) {
+                command.assembleServer((GeronimoDeploymentManager) connection.getDeploymentManager(),
pluginsToInstall, "repository", relativeServerPath, this);
+                ((GeronimoDeploymentManager) connection.getDeploymentManager()).archive(relativeServerPath,
"var/temp", new Artifact(group, artifact, version, format));
             }
         }
         return null;



Mime
View raw message