geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r924622 - in /geronimo/server/branches/2.2/framework/modules: geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/ geronimo-deploy-tool/ geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/
Date Thu, 18 Mar 2010 03:21:02 GMT
Author: genspring
Date: Thu Mar 18 03:21:00 2010
New Revision: 924622

URL: http://svn.apache.org/viewvc?rev=924622&view=rev
Log:
GERONIMO-5027 Redeploy option for farming.  Based on patch from Ashish.

Modified:
    geronimo/server/branches/2.2/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/RedeployCommandMetaData.java
  (contents, props changed)
    geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool/   (props changed)
    geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java

Modified: geronimo/server/branches/2.2/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/RedeployCommandMetaData.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/RedeployCommandMetaData.java?rev=924622&r1=924621&r2=924622&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/RedeployCommandMetaData.java
(original)
+++ geronimo/server/branches/2.2/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/RedeployCommandMetaData.java
Thu Mar 18 03:21:00 2010
@@ -26,7 +26,7 @@ public class RedeployCommandMetaData ext
     public static final CommandMetaData META_DATA = new RedeployCommandMetaData();
 
     private RedeployCommandMetaData() {
-        super("redeploy", "1. Common Commands", "[module] [plan] [ModuleID|TargetModuleID+]",
+        super("redeploy", "1. Common Commands", "[--targets target] [module] [plan] [ModuleID|TargetModuleID+]",
                 "A shortcut to undeploy a module from one or more servers, then " +
                 "deploy a new version.  This is not a smooth cutover -- some client " +
                 "requests may be rejected while the redeploy takes place.\n" +
@@ -42,7 +42,10 @@ public class RedeployCommandMetaData ext
                 "If no ModuleID or TargetModuleID is specified, and you're deploying to "+
                 "Geronimo, the deployer will attempt to guess the correct ModuleID for "+
                 "you based on the module and/or plan you provided.\n"+
-                "Note: To specify a TargetModuleID, use the form TargetName|ModuleName");
+                "Note: To specify a TargetModuleID, use the form TargetName|ModuleName" +
+                "Use --targets option only for clustering redeployment. " +
+                "For clustering redeployment you can find the target with deploy list-targets
command. " +
+                "Copy the one with the name as MasterConfigurationStore and use it as a target
variable.");
     }
     
     public CommandArgs parse(String[] newArgs) throws CLParserException {

Propchange: geronimo/server/branches/2.2/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/RedeployCommandMetaData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 18 03:21:00 2010
@@ -1 +1 @@
-/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool:917412
+/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool:917412,924620

Modified: geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java?rev=924622&r1=924621&r2=924622&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
(original)
+++ geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
Thu Mar 18 03:21:00 2010
@@ -20,6 +20,7 @@ package org.apache.geronimo.deployment.c
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.enterprise.deploy.spi.DeploymentManager;
@@ -28,7 +29,10 @@ import javax.enterprise.deploy.spi.Targe
 import javax.enterprise.deploy.spi.exceptions.TargetException;
 import javax.enterprise.deploy.spi.status.ProgressObject;
 
+import org.apache.geronimo.cli.CLParserException;
 import org.apache.geronimo.cli.deployer.CommandArgs;
+import org.apache.geronimo.cli.deployer.DistributeCommandArgs;
+import org.apache.geronimo.cli.deployer.DistributeCommandArgsImpl;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.FileUtils;
 import org.apache.geronimo.kernel.repository.Artifact;
@@ -36,18 +40,97 @@ import jline.ConsoleReader;
 
 /**
  * The CLI deployer logic to redeploy.
- *
+ * 
  * @version $Rev$ $Date$
  */
 public class CommandRedeploy extends AbstractCommand {
 
-    public void execute(ConsoleReader consoleReader, ServerConnection connection, CommandArgs
commandArgs) throws DeploymentException {
+    public void checkFirstArguement(File args) throws DeploymentException {
+        if (!args.exists()) {
+            throw new DeploymentSyntaxException("Module or plan file does not exist: " +
args.getAbsolutePath());
+        }
+        if (!args.canRead()) {
+            throw new DeploymentException("Cannot read file " + args.getAbsolutePath());
+        }
+
+    }
+
+    protected String getAction() {
+        return "Redeployed";
+    }
+
+    public String guessModuleId(List modules, ServerConnection connection, ConsoleReader
consoleReader, File plan,
+            File module, TargetModuleID[] allModules) throws DeploymentException {
+        String moduleId = null;
+        try {
+            if (modules.size() == 0 && connection.isGeronimo()) {
+                emit(consoleReader,
+                        "No ModuleID or TargetModuleID provided.  Attempting to guess based
on the content of the "
+                                + (plan == null ? "archive" : "plan") + ".");
+                try {
+                    if (plan != null) {
+                        moduleId = DeployUtils.extractModuleIdFromPlan(plan);
+                        if (moduleId == null) { // plan just doesn't have a
+                            // config ID
+                            String fileName = module == null ? plan.getName() : module.getName();
+                            int pos = fileName.lastIndexOf('.');
+                            String artifactId = pos > -1 ? module.getName().substring(0,
pos) : module.getName();
+                            moduleId = Artifact.DEFAULT_GROUP_ID + "/" + artifactId + "_G_MASTER"
+ "//";
+                            emit(consoleReader,
+                                    "Unable to locate Geronimo deployment plan in archive.
 Calculating default ModuleID from archive name.");
+                        } else {
+                            Artifact configId = null;
+                            configId = Artifact.create(moduleId);
+                            moduleId = configId.getGroupId() + "/" + configId.getArtifactId()
+ "_G_MASTER" + "/"
+                                    + configId.getVersion() + "/" + configId.getType();
+                        }
+                    } else if (module != null) {
+                        moduleId = DeployUtils.extractModuleIdFromArchive(module);
+                        if (moduleId == null) {
+                            int pos = module.getName().lastIndexOf('.');
+                            String artifactId = pos > -1 ? module.getName().substring(0,
pos) : module.getName();
+                            moduleId = Artifact.DEFAULT_GROUP_ID + "/" + artifactId + "_G_MASTER"
+ "//";
+                            emit(consoleReader,
+                                    "Unable to locate Geronimo deployment plan in archive.
 Calculating default ModuleID from archive name.");
+                        } else {
+                            Artifact configId = null;
+                            configId = Artifact.create(moduleId);
+                            moduleId = configId.getGroupId() + "/" + configId.getArtifactId()
+ "_G_MASTER" + "/"
+                                    + configId.getVersion() + "/" + configId.getType();
+                            }
+                    }
+                } catch (IOException e) {
+                    throw new DeploymentException("Unable to read input files: " + e.getMessage(),
e);
+                }
+                if (moduleId != null) {
+                    emit(consoleReader, "Attempting to use ModuleID '" + moduleId + "'");
+                    modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, moduleId,
true));
+                } else {
+                    emit(consoleReader, "Unable to calculate a ModuleID from supplied module
and/or plan.");
+                }
+            }
+            if (modules.size() == 0) { // Either not deploying to Geronimo or unable to identify
modules
+                throw new DeploymentSyntaxException(
+                        "No ModuleID or TargetModuleID available.  Nothing to do.  Maybe
you should add a ModuleID or TargetModuleID to the command line?");
+            }
+        } catch (IOException e) {
+            throw new DeploymentException("Unable to read input files: " + e.getMessage(),
e);
+        }
+
+        return moduleId;
+    }
+
+    public void execute(ConsoleReader consoleReader, ServerConnection connection, CommandArgs
commandArgs)
+            throws DeploymentException {
+
         ProgressObject po;
+        DistributeCommandArgs distributeCommandArgs = null;
         try {
             String[] args = commandArgs.getArgs();
 
             if (args.length == 0) {
-                throw new DeploymentSyntaxException("Must specify a module or plan (or both)
and optionally module IDs to replace");
+                throw new DeploymentSyntaxException(
+                        "Must specify a module or plan (or both) and optionally module IDs
to replace");
             }
 
             DeploymentManager mgr = connection.getDeploymentManager();
@@ -58,33 +141,168 @@ public class CommandRedeploy extends Abs
             } catch (TargetException e) {
                 throw new DeploymentException("Unable to load modules from server", e);
             }
+            if (args.length >= 3 && args[0].equalsIgnoreCase("--targets")) //
case of cluster redeployment
+            {
+                List modules = new ArrayList();
+                boolean multipleTargets;
+                File test = null;
+                File test1 = null;
+                File module = null;
+                File plan = null;
+                test = new File(args[2]); // check whether args[2] is a module or a plan
+                checkFirstArguement(test);
+                if (FileUtils.isJarFile(test) || test.isDirectory()) {
+                    if (module != null) {
+                        throw new DeploymentSyntaxException("Module and plan cannot both
be JAR files or directories!");
+                    }
+                    module = test;
+                } else {
+                    if (plan != null) {
+                        throw new DeploymentSyntaxException("Module or plan must be a JAR
file or directory!");
+                    }
+                    plan = test;
+                }
+                if (args.length >= 4) {// than it can be plan,moduleId,TargetModuleId
+                    test1 = new File(args[3]);
+                    if (test1.exists() && test1.canRead()) // check if it is plan
+                    {
+                        if (FileUtils.isJarFile(test1) || test1.isDirectory()) {
+                            if (module != null) {
+                                throw new DeploymentSyntaxException(
+                                        "Module and plan cannot both be JAR files or directories!");
+                            }
+                            module = test1;
+                        } else {
+                            if (plan != null) {
+                                throw new DeploymentSyntaxException("Module or plan must
be a JAR file or directory!");
+                            }
+                            plan = test1;
+                        }
+                    } else
+                        modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, args[3],
false));
+                }
+                if (module != null) {
+                    module = module.getAbsoluteFile();
+                }
+                if (plan != null) {
+                    plan = plan.getAbsoluteFile();
+                }
+                if (args.length >= 5) // Amy arguements beyond 4 should be ModuleId or
Target ModuleId
+                {
+                    for (int i = 4; i < args.length; i++) {
+                        modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, args[i],
false));
+                    }
+                }
+                try {
+                    distributeCommandArgs = new DistributeCommandArgsImpl(args);
+                } catch (CLParserException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
 
-            List modules = new ArrayList();
-            File module = null;
-            File plan = null;
-            File test = new File(args[0]); // Guess whether the first argument is a module
or a plan
-            if (!test.exists()) {
-                throw new DeploymentSyntaxException("Module or plan file does not exist:
" + test.getAbsolutePath());
-            }
-            if (!test.canRead()) {
-                throw new DeploymentException("Cannot read file " + test.getAbsolutePath());
-            }
-            try {
+                List<String> targets = Arrays.asList(distributeCommandArgs.getTargets());
+                if (targets.size() > 0) {
+                    Target[] tlist = identifyTargets(targets, mgr); // before starting undeployment
and deployment verify the correctness of target argument
+                }
+                if (modules.size() == 0) {
+                    String moduleId = guessModuleId(modules, connection, consoleReader, plan,
module, allModules);
+                    modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, moduleId,
false));
+                }
+
+                TargetModuleID[] ids = (TargetModuleID[]) modules.toArray(new TargetModuleID[modules.size()]);
+                boolean multiple = isMultipleTargets(ids);
+                po = mgr.undeploy(ids);
+                waitForProgress(consoleReader, po);
+                TargetModuleID[] done = po.getResultTargetModuleIDs();
+
+                if (targets.size() > 0) {
+                    Target[] tlist = identifyTargets(targets, mgr);
+                    multipleTargets = tlist.length > 1;
+                    po = mgr.distribute(tlist, module, plan);
+                    waitForProgress(consoleReader, po);
+                } else {
+                    Target[] tlist = mgr.getTargets();
+                    if (null == tlist) {
+                        throw new IllegalStateException("No target to distribute to");
+                    }
+                    tlist = new Target[] { tlist[0] };
+                    multipleTargets = tlist.length > 1;
+                    po = mgr.distribute(tlist, module, plan);
+                    waitForProgress(consoleReader, po);
+                }
+                if (po.getDeploymentStatus().isFailed()) {
+                    throw new DeploymentException("Unable to redeploy "
+                            + (module == null ? plan.getName() : module.getName()) + ": "
+                            + po.getDeploymentStatus().getMessage());
+                }
+                po = mgr.start(po.getResultTargetModuleIDs());
+                waitForProgress(consoleReader, po);
+                TargetModuleID[] resultsDeployment = po.getResultTargetModuleIDs();
+                for (int i = 0; i < resultsDeployment.length; i++) {
+                    TargetModuleID result = resultsDeployment[i];
+                    consoleReader.printString(DeployUtils.reformat("Deployed"
+                            + " "
+                            + result.getModuleID()
+                            + (multipleTargets ? " to " + result.getTarget().getName() :
"")
+                            + (result.getWebURL() == null || !getAction().equals("Deployed")
? "" : " @ "
+                                    + result.getWebURL()), 4, 72));
+                    if (result.getChildTargetModuleID() != null) {
+                        for (int j = 0; j < result.getChildTargetModuleID().length; j++)
{
+                            TargetModuleID child = result.getChildTargetModuleID()[j];
+                            consoleReader.printString(DeployUtils.reformat("  `-> "
+                                    + child.getModuleID()
+                                    + (child.getWebURL() == null || !getAction().equals("Deployed")
? "" : " @ "
+                                            + child.getWebURL()), 4, 72));
+                        }
+                    }
+                }
+                // print the results that succeeded
+                TargetModuleID[] results = po.getResultTargetModuleIDs();
+                for (int i = 0; i < results.length; i++) {
+                    TargetModuleID result = results[i];
+                    consoleReader.printString(DeployUtils.reformat(getAction()
+                            + " "
+                            + result.getModuleID()
+                            + (multipleTargets ? " to " + result.getTarget().getName() :
"")
+                            + (result.getWebURL() == null || !getAction().equals("Deployed")
? "" : " @ "
+                                    + result.getWebURL()), 4, 72));
+                    if (result.getChildTargetModuleID() != null) {
+                        for (int j = 0; j < result.getChildTargetModuleID().length; j++)
{
+                            TargetModuleID child = result.getChildTargetModuleID()[j];
+                            consoleReader.printString(DeployUtils.reformat("  `-> "
+                                    + child.getModuleID()
+                                    + (child.getWebURL() == null || !getAction().equals("Deployed")
? "" : " @ "
+                                            + child.getWebURL()), 4, 72));
+                        }
+                    }
+                }
+                // if any results failed then throw so that we'll return non-0 to the operating
system
+                if (po.getDeploymentStatus().isFailed()) {
+                    throw new DeploymentException("Operation failed: " + po.getDeploymentStatus().getMessage());
+                }
+            } else { // case of local redeployment
+                List modules = new ArrayList();
+                File module = null;
+                File plan = null;
+                File test = new File(args[0]); // Guess whether the first argument is a module
or a plan
+                if (!test.exists()) {
+                    throw new DeploymentSyntaxException("Module or plan file does not exist:
" + test.getAbsolutePath());
+                }
+                if (!test.canRead()) {
+                    throw new DeploymentException("Cannot read file " + test.getAbsolutePath());
+                }
                 if (FileUtils.isJarFile(test) || test.isDirectory()) {
                     module = test;
                 } else {
                     plan = test;
                 }
-            } catch (IOException e) {
-                throw new DeploymentException("Invalid JAR File " + args[0]);
-            }
-            if (args.length > 1) { // Guess whether the second argument is a module, plan,
ModuleID, or TargetModuleID
-                test = new File(args[1]);
-                if (test.exists() && test.canRead() && !args[1].equals(args[0]))
{
-                    try {
+                if (args.length > 1) { // Guess whether the second argument is a module,
plan, ModuleID or TargetModuleID
+                    test = new File(args[1]);
+                    if (test.exists() && test.canRead() && !args[1].equals(args[0]))
{
                         if (FileUtils.isJarFile(test) || test.isDirectory()) {
                             if (module != null) {
-                                throw new DeploymentSyntaxException("Module and plan cannot
both be JAR files or directories!");
+                                throw new DeploymentSyntaxException(
+                                        "Module and plan cannot both be JAR files or directories!");
                             }
                             module = test;
                         } else {
@@ -93,70 +311,77 @@ public class CommandRedeploy extends Abs
                             }
                             plan = test;
                         }
-                    } catch (IOException e) {
-                        throw new DeploymentException("Invalid JAR File " + args[1]);
+                    } else {
+                        modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, args[1],
false));
                     }
-                } else {
-                    modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, args[1],
false));
                 }
-            }
-            for (int i = 2; i < args.length; i++) { // Any arguments beyond 2 must be
a ModuleID or TargetModuleID
-                modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, args[i], false));
-            }
-            // If we don't have any moduleIDs, try to guess one.
-            if (modules.size() == 0 && connection.isGeronimo()) {
-                emit(consoleReader, "No ModuleID or TargetModuleID provided.  Attempting
to guess based on the content of the " + (plan == null ? "archive" : "plan") + ".");
-                String moduleId = null;
-                try {
-                    if (plan != null) {
-                        moduleId = DeployUtils.extractModuleIdFromPlan(plan);
-                        if (moduleId == null) { // plan just doesn't have a config ID
-                            String fileName = module == null ? plan.getName() : module.getName();
-                            int pos = fileName.lastIndexOf('.');
-                            String artifactId = pos > -1 ? module.getName().substring(0,
pos) : module.getName();
-                            moduleId = Artifact.DEFAULT_GROUP_ID + "/" + artifactId + "//";
-                            emit(consoleReader, "Unable to locate Geronimo deployment plan
in archive.  Calculating default ModuleID from archive name.");
-                        }
-                    } else if (module != null) {
-                        moduleId = DeployUtils.extractModuleIdFromArchive(module);
-                        if (moduleId == null) {
-                            int pos = module.getName().lastIndexOf('.');
-                            String artifactId = pos > -1 ? module.getName().substring(0,
pos) : module.getName();
-                            moduleId = Artifact.DEFAULT_GROUP_ID + "/" + artifactId + "//";
-                            emit(consoleReader, "Unable to locate Geronimo deployment plan
in archive.  Calculating default ModuleID from archive name.");
+                for (int i = 2; i < args.length; i++) { // Any arguments beyond 2 must
be a ModuleID or TargetModuleID
+                    modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, args[i],
false));
+                }
+                // If we don't have any moduleIDs, try to guess one.
+                if (modules.size() == 0 && connection.isGeronimo()) {
+                    emit(consoleReader,
+                            "No ModuleID or TargetModuleID provided.  Attempting to guess
based on the content of the "
+                                    + (plan == null ? "archive" : "plan") + ".");
+                    String moduleId = null;
+                    try {
+                        if (plan != null) {
+                            moduleId = DeployUtils.extractModuleIdFromPlan(plan);
+                            if (moduleId == null) { // plan just doesn't have a config ID
+                                String fileName = module == null ? plan.getName() : module.getName();
+                                int pos = fileName.lastIndexOf('.');
+                                String artifactId = pos > -1 ? module.getName().substring(0,
pos) : module.getName();
+                                moduleId = Artifact.DEFAULT_GROUP_ID + "/" + artifactId +
"//";
+                                emit(consoleReader,
+                                        "Unable to locate Geronimo deployment plan in archive.
 Calculating default ModuleID from archive name.");
+                            }
+                        } else if (module != null) {
+                            moduleId = DeployUtils.extractModuleIdFromArchive(module);
+                            if (moduleId == null) {
+                                int pos = module.getName().lastIndexOf('.');
+                                String artifactId = pos > -1 ? module.getName().substring(0,
pos) : module.getName();
+                                moduleId = Artifact.DEFAULT_GROUP_ID + "/" + artifactId +
"//";
+                                emit(consoleReader,
+                                        "Unable to locate Geronimo deployment plan in archive.
 Calculating default ModuleID from archive name.");
+                            }
                         }
+                    } catch (IOException e) {
+                        throw new DeploymentException("Unable to read input files: " + e.getMessage(),
e);
+                    }
+                    if (moduleId != null) {
+                        emit(consoleReader, "Attempting to use ModuleID '" + moduleId + "'");
+                        modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, moduleId,
true));
+                    } else {
+                        emit(consoleReader, "Unable to calculate a ModuleID from supplied
module and/or plan.");
                     }
-                } catch (IOException e) {
-                    throw new DeploymentException("Unable to read input files: " + e.getMessage(),
e);
                 }
-                if (moduleId != null) {
-                    emit(consoleReader, "Attempting to use ModuleID '" + moduleId + "'");
-                    modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, moduleId,
true));
-                } else {
-                    emit(consoleReader, "Unable to calculate a ModuleID from supplied module
and/or plan.");
+                if (modules.size() == 0) { // Either not deploying to Geronimo or unable
to identify modules
+                    throw new DeploymentSyntaxException(
+                            "No ModuleID or TargetModuleID available.  Nothing to do.  Maybe
you should add a ModuleID or TargetModuleID to the command line?");
                 }
-            }
-            if (modules.size() == 0) { // Either not deploying to Geronimo or unable to identify
modules
-                throw new DeploymentSyntaxException("No ModuleID or TargetModuleID available.
 Nothing to do.  Maybe you should add a ModuleID or TargetModuleID to the command line?");
-            }
-            if (module != null) {
-                module = module.getAbsoluteFile();
-            }
-            if (plan != null) {
-                plan = plan.getAbsoluteFile();
-            }
-            // Now that we've sorted out all the arguments, do the work
-            TargetModuleID[] ids = (TargetModuleID[]) modules.toArray(new TargetModuleID[modules.size()]);
-            boolean multiple = isMultipleTargets(ids);
-            po = mgr.redeploy(ids, module, plan);
-            waitForProgress(consoleReader, po);
-            TargetModuleID[] done = po.getResultTargetModuleIDs();
-            for (TargetModuleID id : done) {
-                emit(consoleReader, "Redeployed " + id.getModuleID() + (multiple ? " on "
+ id.getTarget().getName() : "") + (id.getWebURL() == null ? "" : " @ " + id.getWebURL()));
-                if (id.getChildTargetModuleID() != null) {
-                    for (int j = 0; j < id.getChildTargetModuleID().length; j++) {
-                        TargetModuleID child = id.getChildTargetModuleID()[j];
-                        emit(consoleReader, "  `-> " + child.getModuleID() + (child.getWebURL()
== null ? "" : " @ " + child.getWebURL()));
+                if (module != null) {
+                    module = module.getAbsoluteFile();
+                }
+                if (plan != null) {
+                    plan = plan.getAbsoluteFile();
+                }
+                // Now that we've sorted out all the arguments, do the work
+                TargetModuleID[] ids = (TargetModuleID[]) modules.toArray(new TargetModuleID[modules.size()]);
+                boolean multiple = isMultipleTargets(ids);
+                po = mgr.redeploy(ids, module, plan);
+                waitForProgress(consoleReader, po);
+                TargetModuleID[] done = po.getResultTargetModuleIDs();
+                for (int i = 0; i < done.length; i++) {
+                    TargetModuleID id = done[i];
+                    emit(consoleReader, "Redeployed " + id.getModuleID()
+                            + (multiple ? " on " + id.getTarget().getName() : "")
+                            + (id.getWebURL() == null ? "" : " @ " + id.getWebURL()));
+                    if (id.getChildTargetModuleID() != null) {
+                        for (int j = 0; j < id.getChildTargetModuleID().length; j++) {
+                            TargetModuleID child = id.getChildTargetModuleID()[j];
+                            emit(consoleReader, "  `-> " + child.getModuleID()
+                                    + (child.getWebURL() == null ? "" : " @ " + child.getWebURL()));
+                        }
                     }
                 }
             }



Mime
View raw message