1.x is up and running in a bundle and able to run the calculator sample. Now to add back in the 2.x launch steps.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882125 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 14 deletions

diff --git a/sandbox/slaws/runtimecompat/combinedlauncher/src/main/java/launcher/CombinedLauncher.java b/sandbox/slaws/runtimecompat/combinedlauncher/src/main/java/launcher/CombinedLauncher.java
index 5809f572fa..44579125ff 100644
--- a/sandbox/slaws/runtimecompat/combinedlauncher/src/main/java/launcher/CombinedLauncher.java
+++ b/sandbox/slaws/runtimecompat/combinedlauncher/src/main/java/launcher/CombinedLauncher.java
@@ -63,10 +63,11 @@ public class CombinedLauncher {
         Bundle oneXLauncherbundle = equinoxHost.installBundle(new URL("file:///C:/simon/tuscany/sandbox/runtimecompat/1xlauncher/target/1x-launcher.jar"), "1xlauncherbundle");
         
         System.out.println("Bundles loaded");
-/*        
+        
         // load 2xcalculator
         // find the the 2.x node launcher util 
         // Get the node runtime bundle.
+/*        
         Bundle twoXbundle = null;
         for (Bundle b : bundleContext.getBundles()) {
             if (TWO_X_NODE_LAUNCHER_EQUINOX_BUNDLE.equals(b.getSymbolicName())) {
@@ -118,13 +119,8 @@ public class CombinedLauncher {
         startMethod.invoke(node);
         
         System.out.println("2.x Running");
-*/        
-//        try {
-//        	System.out.println("Waiting");
-//        	Thread.sleep(20000);
-//        } catch (Exception ex) {
-//        	
-//        }
+*/
+
         
     	// load 1xcalculator
         // find the the 1.x node launcher
@@ -134,12 +130,11 @@ public class CombinedLauncher {
         
         System.out.println("1.x Running");
         
-//        try {
-//        	System.out.println("Press a key");
-//        	System.in.read();
-//        } catch (Exception ex) {
-//        	
-//        }
+        try {
+        	System.out.println("Press a key");
+        	System.in.read();
+        } catch (Exception ex) {
+        }
         
         equinoxHost.stop();
     }