Copy 1.3 branch revisions 678491, 678875, 679082, 679205, 679334 and 679385

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

1 files changed, 4 insertions, 2 deletions

diff --git a/java/sca/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/java/sca/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
index 14eefadaba..8346dcc01a 100644
--- a/java/sca/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ b/java/sca/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
@@ -19,6 +19,7 @@
 -->
 <definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
     xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:test="http://tuscany.apache.org/xmlns/sca/1.0"
     xmlns:calc="http://calculator">
     
     <!-- Extension Types Metadata -->
@@ -46,7 +47,7 @@
  
   <intent name="TestIntentTwo" 
  			 constrains="sca:binding"
- 			 requires="TestIntentOne">
+ 			 requires="test:TestIntentOne">
  			 <description>
  			 	Protect messages from unauthorized reading or modification
  			 </description>
@@ -91,6 +92,7 @@
  </policySet>
 
 <policySet name="SecurityPolicy" provides="test:confidentiality"
+    appliesTo="binding.ws"
 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
     <intentMap provides="test:confidentiality" default="message">
@@ -137,7 +139,7 @@
 
 <policySet name="ConfidentialityPolicies"
  provides="test:confidentiality"
- bindings="binding.ws"
+ appliesTo="binding.ws"
  xmlns="http://www.osoa.org/xmlns/sca/1.0"
     xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
     <intentMap provides="test:confidentiality"  default="transport">