You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/05/18 15:11:50 UTC

svn commit: r1124252 - /tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java

Author: antelder
Date: Wed May 18 13:11:50 2011
New Revision: 1124252

URL: http://svn.apache.org/viewvc?rev=1124252&view=rev
Log:
Fix Shell started command to not rely on the installed contributions (which may have been uninstalled)

Modified:
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java

Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java?rev=1124252&r1=1124251&r2=1124252&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java Wed May 18 13:11:50 2011
@@ -460,24 +460,24 @@ public class Shell {
         if (nodes.size() > 0) {
             for (Node node : nodes.values()) {
                 out.println("Domain: " + node.getDomainName());
-                List<String> ics;
-                if (toks.size() > 1) {
-                    ics = new ArrayList<String>();
-                    ics.add(toks.get(1));
-                } else {
-                    ics = node.getInstalledContributionURIs();
-                }
-
-                for (String curi : ics) {
-                    List<String> cs = node.getStartedCompositeURIs().get(curi);
-                    if (cs != null) {
-                        for (String compositeURI : cs) {
-                            out.println("   " + curi
-                                + " "
-                                + compositeURI);
-                }
+//                List<String> ics;
+//                if (toks.size() > 1) {
+//                    ics = new ArrayList<String>();
+//                    ics.add(toks.get(1));
+//                } else {
+//                    ics = node.getInstalledContributionURIs();
+//                }
+//
+//                for (String curi : ics) {
+//                    List<String> cs = node.getStartedCompositeURIs().get(curi);
+//                    if (cs != null) {
+                for (String curi : node.getStartedCompositeURIs().keySet()) {
+                    for (String compositeURI : node.getStartedCompositeURIs().get(curi)) {
+                        out.println("   " + curi + " " + compositeURI);
                     }
                 }
+//                    }
+//                }
             }
         }
         return true;