TUSCANY-3988 - Apply Greg's suggested fix to ensure that policy provider lists are maintained independently for cloned composites. Add a tests case for it as well.

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

1 files changed, 15 insertions, 6 deletions

diff --git a/sca-java-2.x/trunk/testing/itest/implementation-composite/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/main/resources/policy/PolicyOuterComposite.composite
index 6e686a579f..23c39fce82 100644
--- a/sca-java-2.x/trunk/testing/itest/implementation-composite/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/main/resources/policy/PolicyOuterComposite.composite
@@ -20,20 +20,29 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

     targetNamespace="http://policy"

     xmlns:policy="http://policy"

-    name="PolicyOuterComposite"

-    requires="policy:TestIntent_1">

+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

+    name="PolicyOuterComposite">

     

     <component name="TargetClientComponent">

         <implementation.java class="policy.TargetClientImpl"/>

-        <reference name="targetService" target="OuterTargetServiceComponent"/>

+        <reference name="targetService1" target="OuterTargetService1Component"/>

+        <reference name="targetService2" target="OuterTargetService2Component"/>

     </component>

     

-    <component name="OuterTargetServiceComponent">

+    <component name="OuterTargetService1Component">

         <implementation.composite name="policy:PolicyInnerComposite"/>

-        <service name="TargetService">

+        <service name="TargetService" requires="tuscany:logging">

             <interface.java interface="policy.Target"/>

-            <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>

+            <binding.ws uri="http://localhost:8085/OuterTargetService1Component"/>

         </service>

     </component>

+    

+    <component name="OuterTargetService2Component">

+        <implementation.composite name="policy:PolicyInnerComposite"/>

+        <service name="TargetService"  requires="tuscany:logging">

+            <interface.java interface="policy.Target"/>

+            <binding.ws uri="http://localhost:8085/OuterTargetService2Component"/>

+        </service>

+    </component>    

 

 </composite>