svn commit: r219120 - in /geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local: CommandSupport.java RedeployCommand.java StopCommand.java UndeployCommand.java

[am...@apache.org]

Author: ammulder
Date: Thu Jul 14 15:24:33 2005
New Revision: 219120

URL: http://svn.apache.org/viewcvs?rev=219120&view=rev
Log:
A little cleanup

Modified:
    geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java
    geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
    geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
    geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java

Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java?rev=219120&r1=219119&r2=219120&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java (original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java Thu Jul 14 15:24:33 2005
@@ -123,7 +123,10 @@
 
     protected void doFail(Exception e) {
         if (e instanceof InternalKernelException) {
-            e = (Exception)((InternalKernelException)e).getCause();
+            Exception test = (Exception)((InternalKernelException)e).getCause();
+            if(test != null) {
+                e = test;
+            }
         }
 
         if (commandContext.isLogErrors()) {

Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=219120&r1=219119&r2=219120&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java Thu Jul 14 15:24:33 2005
@@ -43,12 +43,12 @@
     private final TargetModuleID[] modules;
 
     public RedeployCommand(Kernel kernel, TargetModuleID[] moduleIDList, File moduleArchive, File deploymentPlan) {
-        super(CommandType.DISTRIBUTE, kernel, moduleArchive, deploymentPlan, null, null, false);
+        super(CommandType.REDEPLOY, kernel, moduleArchive, deploymentPlan, null, null, false);
         this.modules = moduleIDList;
     }
 
     public RedeployCommand(Kernel kernel, TargetModuleID[] moduleIDList, InputStream moduleArchive, InputStream deploymentPlan) {
-        super(CommandType.START, kernel, null, null, moduleArchive, deploymentPlan, true);
+        super(CommandType.REDEPLOY, kernel, null, null, moduleArchive, deploymentPlan, true);
         this.modules = moduleIDList;
     }
 

Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java?rev=219120&r1=219119&r2=219120&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java (original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java Thu Jul 14 15:24:33 2005
@@ -40,7 +40,7 @@
     private final TargetModuleID[] modules;
 
     public StopCommand(Kernel kernel, TargetModuleID modules[]) {
-        super(CommandType.START);
+        super(CommandType.STOP);
         this.kernel = kernel;
         this.modules = modules;
     }

Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java?rev=219120&r1=219119&r2=219120&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java (original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java Thu Jul 14 15:24:33 2005
@@ -41,7 +41,7 @@
     private final TargetModuleID[] modules;
 
     public UndeployCommand(Kernel kernel, TargetModuleID modules[]) {
-        super(CommandType.START);
+        super(CommandType.UNDEPLOY);
         this.kernel = kernel;
         this.modules = modules;
     }