svn commit: r954860 - in /tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src: main/resources/CallBackBasicTest.composite test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java

[slaws]

Author: slaws
Date: Tue Jun 15 13:03:32 2010
New Revision: 954860

URL: http://svn.apache.org/viewvc?rev=954860&view=rev
Log:
Tidy up callback test URIs and temporarily disable the first one pending 
TUSCANY-3593

Modified:
    
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
    
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java

Modified: 
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite?rev=954860&r1=954859&r2=954860&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
 (original)
+++ 
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
 Tue Jun 15 13:03:32 2010
@@ -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>     
     

Modified: 
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java?rev=954860&r1=954859&r2=954860&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
 Tue Jun 15 13:03:32 2010
@@ -23,9 +23,7 @@ import org.apache.tuscany.sca.node.Contr
 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();