geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: rev 47545 - in geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment: . plugin/local
Date Thu, 30 Sep 2004 03:40:10 GMT
Author: jboynes
Date: Wed Sep 29 20:40:09 2004
New Revision: 47545

Modified:
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java
Log:
Make deploy just return String

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
Wed Sep 29 20:40:09 2004
@@ -148,7 +148,7 @@
                 if (install) {
                     URI uri = store.install(carfile.toURL());
                     List deployedURIs = new ArrayList(childURIs.size() + 1);
-                    deployedURIs.add(uri);
+                    deployedURIs.add(uri.toString());
                     deployedURIs.addAll(childURIs);
                     return deployedURIs;
                 }

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
Wed Sep 29 20:40:09 2004
@@ -96,10 +96,10 @@
             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 = ((URI) objectNames.get(0)).toString();
+                String parentName = (String) objectNames.get(0);
                 String[] childIDs = new String[objectNames.size()-1];
                 for (int j=0; j < childIDs.length; j++) {
-                    childIDs[j] = ((URI)objectNames.get(j+1)).toString();
+                    childIDs[j] = (String)objectNames.get(j+1);
                 }
 
                 TargetModuleID moduleID = new TargetModuleIDImpl(targetList[0], parentName.toString(),
childIDs);

Mime
View raw message