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

3 files changed, 21 insertions, 4 deletions

diff --git a/branches/sca-java-1.x/tutorials/store/README b/branches/sca-java-1.x/tutorials/store/README
index d23bc6b968..47c1354b79 100644
--- a/branches/sca-java-1.x/tutorials/store/README
+++ b/branches/sca-java-1.x/tutorials/store/README
@@ -20,12 +20,12 @@ Running The Tutorial Application
 Start the SCA Domain Manager on linux:
 
    cd domain
-   java -jar ../../../modules/tuscany-node-launcher-1.5.jar domain
+   java -jar ../../../modules/tuscany-node-launcher-1.5.1.jar domain
 
 Start the SCA Domain Manager on windows:
 
    cd domain
-   java -jar ..\..\..\modules\tuscany-node-launcher-1.5.jar domain
+   java -jar ..\..\..\modules\tuscany-node-launcher-1.5.1.jar domain
 
 Access the SCA Domain Manager application by pointing your Web browser at:
 
diff --git a/branches/sca-java-1.x/tutorials/store/store-test/pom.xml b/branches/sca-java-1.x/tutorials/store/store-test/pom.xml
index df4ec0f3e8..b8543a8ff1 100644
--- a/branches/sca-java-1.x/tutorials/store/store-test/pom.xml
+++ b/branches/sca-java-1.x/tutorials/store/store-test/pom.xml
@@ -150,6 +150,13 @@
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>        
 
         <dependency>
             <groupId>org.apache.derby</groupId>
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() {