Remove URIs from reference binding.sca to move these composites toward OASIS. service bindings changes to follow.

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

7 files changed, 13 insertions, 23 deletions

diff --git a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
index 51489a5cd9..385c456ddf 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
+++ b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
@@ -25,8 +25,8 @@
     <!-- callback remote wire -->   
     <component name="AHelloWorldClientCallbackRemote">
 		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" />
-        <reference name="helloWorldService" >
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
+        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
+            <binding.sca/>
             <callback>
                 <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
             </callback>
diff --git a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
index 0c1720540b..bab26454ba 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
+++ b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
@@ -29,7 +29,7 @@
         <service name="HelloWorldServiceCallbackOnewayRemote">
             <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
             <callback>
-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
+                <binding.sca/>
             </callback>            
         </service>
     </component>
diff --git a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
index 13a8b98277..f02c77a01e 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
+++ b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
@@ -25,8 +25,8 @@
     <!-- callback remote wire -->   
     <component name="AHelloWorldClientCallbackRemote">
 		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
-        <reference name="helloWorldService" >
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
+        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
+            <binding.sca/>
             <callback>
                 <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
             </callback>
diff --git a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
index 06a2fb9bed..e0fae3c988 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
+++ b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
@@ -29,7 +29,7 @@
         <service name="HelloWorldServiceCallbackRemote">
             <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
             <callback>
-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
+                <binding.sca/>
             </callback>            
         </service>
     </component>
diff --git a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
index 10c78d0b30..dece7b0d63 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
+++ b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
@@ -26,9 +26,7 @@
     <!-- composite hierarchy -->
     <component name="AHelloWorldClientRemotePromotion">
 		<implementation.composite name="sample:HelloWorldComponent" />
-		<reference name="AHelloWorldClientRemoteReference">
-		    <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/>
-		</reference>
+		<reference name="AHelloWorldClientRemoteReference" target="BHelloWorldServiceRemotePromotion"/>
     </component>
     
 
diff --git a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
index 425e129721..87945b6692 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
+++ b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
@@ -42,33 +42,25 @@
     <!-- local and remote wires -->    
     <component name="AHelloWorldClientLocalAndRemote">
 		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/>
-        </reference>
+        <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote"/>
     </component>  
     
     <!-- multiple services -->
     <component name="AHelloWorldClientMultipleServices">
 		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
-        </reference>
+        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
     </component>  
     
     <component name="AHelloWorldClientMultipleServices2">
 		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemote2Impl" />
-        <reference name="helloWorldService">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>
-        </reference>        
+        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>       
     </component> 
     
     <!-- multiple bindings -->   
     <component name="AHelloWorldClientMultipleBindings">
 		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" >
+        <reference name="helloWorldService" target="BHelloWorldMultipleBindings/HelloWorldServiceRemote/scaBinding">
             <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" />        
-            <binding.sca uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>
-            <binding.ws/>
         </reference>
     </component>
     
diff --git a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
index 53d586a3ad..f94b6d3ba0 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
+++ b/java/sca/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
@@ -70,8 +70,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
         <service name="HelloWorldServiceRemote">
             <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" />
-            <binding.ws uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/>
-            <binding.sca uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>
+            <binding.ws name="wsBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/>
+            <binding.sca name="scaBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>
         </service>
     </component>