geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r602966 - in /geronimo/server/trunk/framework/modules: geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
Date Mon, 10 Dec 2007 16:42:57 GMT
Author: gawor
Date: Mon Dec 10 08:42:55 2007
New Revision: 602966

URL: http://svn.apache.org/viewvc?rev=602966&view=rev
Log:
some minor improvments to the deployer commands

Modified:
    geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java

Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy?rev=602966&r1=602965&r2=602966&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy
Mon Dec 10 08:42:55 2007
@@ -65,9 +65,11 @@
             plugins = command.getPluginCategories(repo, connection.getDeploymentManager(),
consoleReader)
             variables.parent.set("AvailablePlugins", plugins)
         }
-        def pluginsToInstall = command.getInstallList(plugins, consoleReader, repo)
-        if (pluginsToInstall) {
-            command.installPlugins(connection.getDeploymentManager(), pluginsToInstall, repo,
consoleReader, connection)
+        if (plugins) {
+        	def pluginsToInstall = command.getInstallList(plugins, consoleReader, repo)
+        	if (pluginsToInstall) {
+            	command.installPlugins(connection.getDeploymentManager(), pluginsToInstall,
repo, consoleReader, connection)
+        	}
         }
         io.out.println("list ended")
     }

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java?rev=602966&r1=602965&r2=602966&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
Mon Dec 10 08:42:55 2007
@@ -45,6 +45,10 @@
         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");
+            }
+            
             DeploymentManager mgr = connection.getDeploymentManager();
             Target[] allTargets = mgr.getTargets();
             TargetModuleID[] allModules;
@@ -59,7 +63,7 @@
             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("Must specify a module or plan (or both)
and optionally module IDs to replace");
+                throw new DeploymentSyntaxException("Module or plan file does not exist:
" + test.getAbsolutePath());
             }
             if(!test.canRead()) {
                 throw new DeploymentException("Cannot read file "+test.getAbsolutePath());



Mime
View raw message