TUSCANY-3503 - turn off the automatic application of policy sets based on intents. Various changes to tests to take account of this change.

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

2 files changed, 13 insertions, 11 deletions

diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
index 9924208095..5ffeda11df 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
@@ -20,14 +20,14 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+           name="Calculator">
 
     <component name="CalculatorServiceComponent">
         <implementation.spring location="META-INF/spring/CalculatorService-context.xml"/>		
         <reference name="addService" target="AddServiceComponent" />
         <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" requires="tuscany:jaasAuthentication"/>
+        <reference name="multiplyService" target="MultiplyServiceComponent" policySets="tuscany:JaasPolicy"/>
         <reference name="divideService" target="DivideServiceComponent" />
     </component>
 
@@ -39,7 +39,7 @@
         <implementation.java class="calculator.SubtractServiceImpl"/>
     </component>
 
-    <component name="MultiplyServiceComponent" requires="tuscany:jaasAuthentication">
+    <component name="MultiplyServiceComponent" policySets="tuscany:JaasPolicy">
         <implementation.java class="calculator.MultiplyServiceImpl" />
     </component>
 
@@ -51,7 +51,7 @@
         <implementation.spring location="META-INF/spring/CalculatorService-context.xml" requires="tuscany:logging"/>		
         <reference name="addService" target="AddServiceComponent" />
         <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" requires="tuscany:jaasAuthentication"/>
+        <reference name="multiplyService" target="MultiplyServiceComponent" policySets="tuscany:JaasPolicy"/>
         <reference name="divideService" target="DivideServiceComponent" />
     </component>
 
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
index b442b3157a..5c44e023dd 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
@@ -17,14 +17,16 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:calc="http://calculator">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+             targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+             xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+             xmlns:calc="http://calculator">
 
-    <intent name="logging" constrains="sca:implementation" intentType="interaction"/>
+    <intent name="logging" constrains="sca:implementation" intentType="implementation"/>
     
     <!-- PolicySets -->
-    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:binding">
+    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="//sca:binding">
 <!-- empty policy set so that intents are resolved and match works but without including 
      any actual policy runtime artifacts
         <tuscany:jaasAuthentication>
@@ -37,7 +39,7 @@
 
     <!-- PolicySets -->
 
-    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.spring">
+    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="//sca:implementation.spring">
 <!-- empty policy set so that intents are resolved and match works but without including 
      any actual policy runtime artifacts
         <tuscany:jdkLogger name="calculator">