Tidy up callback test URIs and temporarily disable the first one pending TUSCANY-3593

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

2 files changed, 7 insertions, 8 deletions

diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
index 8389be6fad..5441e2e580 100644
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
@@ -30,7 +30,7 @@
     <component name="CallBackBasicService1">
       <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
       <service name="CallBackBasicService">
-         <binding.ws uri="http://localhost:8085/CallBackTargetService"/>
+         <binding.ws uri="http://localhost:8085/CallBackBasicService1"/>
       </service>
     </component>  	
  	      
@@ -39,7 +39,7 @@
 		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
 		<reference name="aCallBackService" target="CallBackBasicService2">
 		    <callback>
-		      <binding.ws uri="http://localhost:8084/CallBackClientService"/>
+		      <binding.ws uri="http://localhost:8084/CallBackBasicClient2"/>
 		    </callback>
 		</reference>
     </component> 
@@ -47,9 +47,9 @@
     <component name="CallBackBasicService2">
       <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
       <service name="CallBackBasicService">
-         <binding.ws uri="http://localhost:8085/CallBackTargetService"/>
+         <binding.ws uri="http://localhost:8085/CallBackTargetService2"/>
          <callback>
-            <binding.ws uri="http://localhost:8084/CallBackClientService"/>
+            <binding.ws uri="http://localhost:8084/CallBackBasicClient2"/>
          </callback>
       </service>
     </component>  
@@ -58,14 +58,14 @@
     <component name="CallBackBasicClient3">
         <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
         <reference name="aCallBackService">
-            <binding.ws uri="http://localhost:8085/CallBackTargetService"/>
+            <binding.ws uri="http://localhost:8085/CallBackBasicService3"/>
         </reference>
     </component> 
     
     <component name="CallBackBasicService3">
       <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
       <service name="CallBackBasicService">
-         <binding.ws uri="http://localhost:8085/CallBackTargetService"/>
+         <binding.ws uri="http://localhost:8085/CallBackBasicService3"/>
       </service>
     </component>     
     
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 8955e31462..991c1b337f 100644
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
@@ -23,9 +23,7 @@ import org.apache.tuscany.sca.node.Contribution;
 import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -42,6 +40,7 @@ public class CallBackBasicTestCase {
     }
 
     @Test
+    @Ignore("TUSCANY-3593")
     public void testCallBackBasic1() {
         CallBackBasicClient aCallBackClient = node.getService(CallBackBasicClient.class, "CallBackBasicClient1");
         aCallBackClient.run();