Merge all changes from 1.5.2 branch into trunk

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

1 files changed, 12 insertions, 2 deletions

diff --git a/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java b/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java
index 556cc42d0b..9cea47fbc8 100644
--- a/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java
+++ b/branches/sca-java-1.x/tutorials/store/store-test/test/StoreSupplierTestCase.java
@@ -58,6 +58,15 @@ public class StoreSupplierTestCase {
         domainManager = managerLauncher.createDomainManager(domainDir);
         domainManager.start();
         
+        /* helpful for debugging
+        try {
+            System.out.println("press enter to continue)");
+            System.in.read();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }     
+       */   
+        
         NodeLauncher nodeLauncher = NodeLauncher.newInstance();
         storeSupplierNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreSupplierNode");
         storeSupplierNode.start();
@@ -78,8 +87,9 @@ public class StoreSupplierTestCase {
         domainManager.stop();
     }
     
-/*    
+    
     @Test
+    @Ignore
     public void testWaitForInput() {
         try {
             System.out.println("press enter to continue)");
@@ -88,7 +98,7 @@ public class StoreSupplierTestCase {
             e.printStackTrace();
         }
     }
-*/
+
     
     @Test
     public void testShop() {