From 6d463f91ecc078ddf5b674c76881182d1ebd991c Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Jul 2008 12:23:19 +0000
Subject: Renumber scenarios and update CompositeBuilderImplNonWiring

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@679385 13f79535-47bb-0310-9956-ffa450edef68
---
 .../builder/src/main/resources/scenario10/scenario10.composite     | 6 +++++-
 .../builder/src/main/resources/scenario10/scenario10a.composite    | 4 ----
 .../builder/src/main/resources/scenario11/scenario11.composite     | 3 +--
 .../builder/src/main/resources/scenario11/scenario11a.composite    | 7 ++++---
 .../builder/src/main/resources/scenario12/scenario12.composite     | 3 +--
 .../builder/src/main/resources/scenario12/scenario12a.composite    | 3 +++
 .../itest/builder/src/main/resources/scenario9/scenario9.composite | 4 +++-
 .../builder/src/main/resources/scenario9/scenario9a.composite      | 3 ---
 8 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'branches/sca-java-1.3/itest/builder/src/main')

diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite
index ad1c6aa4c1..2d127a7bec 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite
@@ -39,12 +39,16 @@
         </service>
         <service name="Service2a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+            <binding.ws uri="http://foo.com/bar" />
         </service>
-        <reference name="reference2">
+        <reference name="reference2" target="ComponentB/Service2a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+            <binding.ws />
         </reference>
         <reference name="reference2a" target="ComponentF">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
+            <binding.ws />
         </reference>        
     </component>
     
diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite
index b4e9c61ef5..98103e360e 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite
@@ -33,8 +33,6 @@
     </reference>
     <reference name="reference2a" promote="ComponentD/reference3a">
         <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
-        <binding.ws />
     </reference>    
 
     <component name="ComponentD">
@@ -44,11 +42,9 @@
         </service>
         <service name="Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
         </service>
         <reference name="reference3" target="ComponentD/Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws/>
         </reference>
         <reference name="reference3a" target="ComponentE">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite
index 776345062b..2f5ca96d07 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite
@@ -39,14 +39,13 @@
         </service>
         <service name="Service2a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+            <binding.ws uri="http://foo.com/bar" />
         </service>
         <reference name="reference2">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
         </reference>
         <reference name="reference2a" target="ComponentF">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
-            <binding.ws />
         </reference>        
     </component>
     
diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 5811e80735..381ccddcc3 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite
@@ -28,11 +28,14 @@
     <service name="Service2a" promote="ComponentD/Service3a">
         <!-- bindings and/or interfaces may or may not be specified explicitly here -->
     </service>
-    <reference name="reference2" promote="ComponentD/reference3">
+    <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a">
         <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+        <binding.ws />
     </reference>
     <reference name="reference2a" promote="ComponentD/reference3a">
         <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
+        <binding.ws />
     </reference>    
 
     <component name="ComponentD">
@@ -42,11 +45,9 @@
         </service>
         <service name="Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
         </service>
         <reference name="reference3" target="ComponentD/Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws/>
         </reference>
         <reference name="reference3a" target="ComponentE">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
index cc2ea5b0e2..23799f8487 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
@@ -30,7 +30,6 @@
     </reference>
     <reference name="reference1a" promote="ComponentB/reference2a">
         <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <binding.ws uri="http://foo.com/bar"/>
     </reference>    
 
     <component name="ComponentB">
@@ -44,7 +43,7 @@
         <reference name="reference2">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
         </reference>
-        <reference name="reference2a">
+        <reference name="reference2a" target="ComponentF">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
         </reference>        
     </component>
diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
index 54eee7d657..a2b4f88dc3 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
@@ -42,12 +42,15 @@
         </service>
         <service name="Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+            <binding.ws uri="http://foo.com/bar" />
         </service>
         <reference name="reference3" target="ComponentD/Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+            <binding.ws/>
         </reference>
         <reference name="reference3a" target="ComponentE">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+            <binding.ws />
         </reference>        
     </component>
     
diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite
index dae3b3deb6..83584ed482 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite
@@ -27,9 +27,11 @@
     </service>
     <reference name="reference1" promote="ComponentB/reference2">
         <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+        <binding.ws uri="http://foo.com/bar"/>
     </reference>
     <reference name="reference1a" promote="ComponentB/reference2a">
         <!-- bindings and/or interfaces may or may not be specified explicitly here -->
+        <binding.ws uri="http://foo.com/bar"/>
     </reference>    
 
     <component name="ComponentB">
@@ -43,7 +45,7 @@
         <reference name="reference2">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
         </reference>
-        <reference name="reference2a" target="ComponentF">
+        <reference name="reference2a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
         </reference>        
     </component>
diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite
index b521bbe01d..0021ec242b 100644
--- a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite
@@ -42,15 +42,12 @@
         </service>
         <service name="Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
         </service>
         <reference name="reference3" target="ComponentD/Service3a">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws/>
         </reference>
         <reference name="reference3a" target="ComponentE">
             <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws />
         </reference>        
     </component>
     
-- 
cgit v1.2.3