geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: rev 57423 - geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local
Date Thu, 11 Nov 2004 08:15:25 GMT
Author: jboynes
Date: Thu Nov 11 00:15:23 2004
New Revision: 57423

Modified:
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
Log:
be a little more flexible when looking for a deployer; include the configId in the output
message

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
Thu Nov 11 00:15:23 2004
@@ -80,7 +80,7 @@
                     copyTo(deploymentPlan, deploymentStream);
                 }
             }
-            Set deployers = kernel.listGBeans(new ObjectName("geronimo.deployment:role=Deployer,*"));
+            Set deployers = kernel.listGBeans(new ObjectName("*:role=Deployer,*"));
             if (deployers.isEmpty()) {
                 fail("No deployer present in kernel");
                 return;
@@ -93,23 +93,20 @@
 
             Object[] args = {moduleArchive, deploymentPlan};
             List objectNames = (List) kernel.invoke(deployer, "deploy", args, DEPLOY_SIG);
-//            System.err.println("deploy returned id " + objectNames.get(0));
-            if (objectNames != null && !objectNames.isEmpty()) {
-                String parentName = (String) objectNames.get(0);
-                String[] childIDs = new String[objectNames.size()-1];
-                for (int j=0; j < childIDs.length; j++) {
-                    childIDs[j] = (String)objectNames.get(j+1);
-                }
-
-                TargetModuleID moduleID = new TargetModuleIDImpl(targetList[0], parentName.toString(),
childIDs);
-//                System.err.println("Distributed moduleId " + moduleID);
-                addModule(moduleID);
-            } else {
+            if (objectNames == null || objectNames.isEmpty()) {
                 DeploymentException deploymentException = new DeploymentException("Got empty
list");
                 deploymentException.printStackTrace();
                 throw deploymentException;
             }
-            complete("Completed");
+            String parentName = (String) objectNames.get(0);
+            String[] childIDs = new String[objectNames.size()-1];
+            for (int j=0; j < childIDs.length; j++) {
+                childIDs[j] = (String)objectNames.get(j+1);
+            }
+
+            TargetModuleID moduleID = new TargetModuleIDImpl(targetList[0], parentName.toString(),
childIDs);
+            addModule(moduleID);
+            complete("Completed with id " + parentName);
         } catch (Exception e) {
             doFail(e);
         } finally {

Mime
View raw message