You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2008/03/08 15:32:11 UTC
svn commit: r634975 - in /incubator/tuscany/java/sca/modules:
definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/
definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/
definitions-xml/src/test/resources/org/apache/tuscany/...
Author: svkrish
Date: Sat Mar 8 06:32:10 2008
New Revision: 634975
URL: http://svn.apache.org/viewvc?rev=634975&view=rev
Log:
fixing issue related to apply targetNamespace of definitions.xml to policy intents and policysets defined within it
Modified:
incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
incubator/tuscany/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
incubator/tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
Modified: incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java?rev=634975&r1=634974&r2=634975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java Sat Mar 8 06:32:10 2008
@@ -42,8 +42,11 @@
import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
+import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.ProfileIntent;
import org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;
import org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;
import org.apache.tuscany.sca.policy.xml.PolicySetProcessor;
@@ -145,7 +148,7 @@
SCADefinitionsUtil.stripDuplicates(scaDefinitions);
extensionProcessor.resolve(scaDefinitions, resolver);
}
-
+
public String getArtifactType() {
return "definitions.xml";
}
Modified: incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java?rev=634975&r1=634974&r2=634975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java Sat Mar 8 06:32:10 2008
@@ -40,6 +40,7 @@
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.QualifiedIntent;
/**
* Processor for SCA Definitions
@@ -56,6 +57,7 @@
public static final String SCA_DEFINITIONS = "definitions";
public static final QName SCA_DEFINITIONS_QNAME = new QName(SCA10_NS, SCA_DEFINITIONS);
public static final String TARGET_NAMESPACE = "targetNamespace";
+ public static final String NAME = "name";
/**
* Construct a new (sca) definitions processor
@@ -73,6 +75,7 @@
public SCADefinitions read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
QName name = null;
SCADefinitions definitions = null;
+ String targetNamespace = null;
while (reader.hasNext()) {
int event = reader.getEventType();
@@ -81,13 +84,24 @@
name = reader.getName();
if ( SCA_DEFINITIONS_QNAME.equals(name)) {
definitions = new SCADefinitionsImpl();
- definitions.setTargetNamespace(reader.getAttributeValue(null, TARGET_NAMESPACE));
+ targetNamespace = reader.getAttributeValue(null, TARGET_NAMESPACE);
+ definitions.setTargetNamespace(targetNamespace);
} else {
Object extension = extensionProcessor.read(reader);
if (extension != null) {
if ( extension instanceof Intent ) {
+ ((Intent)extension).setName(new QName(targetNamespace,
+ ((Intent)extension).getName().getLocalPart()));
+ if ( extension instanceof QualifiedIntent ) {
+ ((QualifiedIntent)extension).getQualifiableIntent().
+ setName(new QName(targetNamespace,
+ ((QualifiedIntent)extension).getQualifiableIntent().getName().getLocalPart()));
+ }
+
definitions.getPolicyIntents().add((Intent)extension);
} else if ( extension instanceof PolicySet ) {
+ ((PolicySet)extension).setName(new QName(targetNamespace,
+ ((PolicySet)extension).getName().getLocalPart()));
definitions.getPolicySets().add((PolicySet)extension);
} else if ( extension instanceof IntentAttachPointType ) {
IntentAttachPointType type = (IntentAttachPointType)extension;
Modified: incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java?rev=634975&r1=634974&r2=634975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java Sat Mar 8 06:32:10 2008
@@ -58,7 +58,8 @@
Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
Map<QName, IntentAttachPointType> bindingTypesTable = new Hashtable<QName, IntentAttachPointType>();
Map<QName, IntentAttachPointType> implTypesTable = new Hashtable<QName, IntentAttachPointType>();
- public static final String namespace = "http://www.osoa.org/xmlns/sca/1.0";
+ public static final String scaNamespace = "http://www.osoa.org/xmlns/sca/1.0";
+ public static final String namespace = "http://test";
private static final QName secureWsPolicy = new QName(namespace, "SecureWSPolicy");
private static final QName confidentiality = new QName(namespace, "confidentiality");
@@ -70,8 +71,8 @@
private static final QName secureMessagingPolicies = new QName(namespace, "SecureMessagingPolicies");
private static final QName securityPolicy = new QName(namespace, "SecurityPolicy");
private static final QName basicAuthMsgProtSecurity = new QName(namespace, "BasicAuthMsgProtSecurity");
- private static final QName wsBinding = new QName(namespace, "binding.ws");
- private static final QName javaImpl = new QName(namespace, "implementation.java");
+ private static final QName wsBinding = new QName(scaNamespace, "binding.ws");
+ private static final QName javaImpl = new QName(scaNamespace, "implementation.java");
@Override
Modified: incubator/tuscany/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml?rev=634975&r1=634974&r2=634975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml (original)
+++ incubator/tuscany/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml Sat Mar 8 06:32:10 2008
@@ -19,14 +19,48 @@
-->
<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://test"
+ xmlns:test="http://test"
xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="logging"
- mayProvide="tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="confidentiality"
- mayProvide="integrity"/>
-
+<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
+ mayProvide="test:tracing"/>
+<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
+ mayProvide="test:integrity"/>
+
+<!-- Intents and Policysets to assume targetnamespace -->
+<intent name="TestIntentOne"
+ constrains="sca:binding"
+ >
+ <description>
+ Test Intent
+ </description>
+ </intent>
+
+ <intent name="TestIntentTwo"
+ constrains="sca:binding"
+ requires="TestIntentOne">
+ <description>
+ Protect messages from unauthorized reading or modification
+ </description>
+ </intent>
+
+ <policySet name="TestPolicySetOne"
+ provides="test:TestIntentOne"
+ appliesTo="sca:binding.ws"
+ xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:PolicyAttachment>
+ <!-- policy expression and policy subject for
+ "basic authentication" -->
+ </wsp:PolicyAttachment>
+ <wsp:PolicyAttachment>
+ <!-- policy expression and policy subject for
+ "reliability" -->
+ </wsp:PolicyAttachment>
+ </policySet>
+
+
<!-- qualified intents -->
<intent name="confidentiality.transport" />
<intent name="confidentiality.message" />
@@ -35,7 +69,7 @@
<!-- POLICY SETS -->
<policySet name="SecureReliablePolicy"
- provides="confidentiality.transport integrity"
+ provides="test:confidentiality.transport test:integrity"
appliesTo="sca:binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
@@ -50,11 +84,11 @@
</policySet>
<policySet name="SecureMessagingPolicies"
- provides="confidentiality"
+ 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="confidentiality" default="transport">
+ <intentMap provides="test:confidentiality" default="transport">
<qualifier name="transport">
<wsp:PolicyAttachment>
<!-- policy expression and policy subject for "transport" alternative -->
@@ -69,10 +103,10 @@
</intentMap>
</policySet>
-<policySet name="SecurityPolicy" provides="confidentiality"
+<policySet name="SecurityPolicy" provides="test:confidentiality"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
- <intentMap provides="confidentiality" default="message">
+ <intentMap provides="test:confidentiality" default="message">
<qualifier name="message">
<intentMap provides="message" default="whole">
<qualifier name="body">
@@ -96,15 +130,15 @@
</policySet>
<policySet name="BasicAuthMsgProtSecurity"
- provides="authentication confidentiality"
+ provides="test:authentication test:confidentiality"
appliesTo="binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <policySetReference name="AuthenticationPolicies"/>
- <policySetReference name="ConfidentialityPolicies"/>
+ <policySetReference name="test:AuthenticationPolicies"/>
+ <policySetReference name="test:ConfidentialityPolicies"/>
</policySet>
<policySet name="AuthenticationPolicies"
- provides="authentication"
+ provides="test:authentication"
appliesTo="binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
@@ -115,11 +149,11 @@
</policySet>
<policySet name="ConfidentialityPolicies"
- provides="confidentiality"
+ provides="test:confidentiality"
bindings="binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <intentMap provides="confidentiality" default="transport">
+ <intentMap provides="test:confidentiality" default="transport">
<qualifier name="transport">
<wsp:PolicyAttachment>
<!-- policy expression and policy subject for "transport"
@@ -137,7 +171,7 @@
</policySet>
<policySet name="SecureWSPolicy"
- provides="confidentiality"
+ provides="test:confidentiality"
appliesTo="sca:binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
@@ -164,7 +198,7 @@
<!-- profile intent -->
<intent name="reliableMessageProtection"
constrains="sca:binding"
- requires="messageProtection">
+ requires="test:messageProtection">
<description>
Protect messages from unauthorized reading or modification
</description>
@@ -172,7 +206,7 @@
<intent name="messageProtection"
constrains="sca:binding"
- requires="confidentiality integrity">
+ requires="test:confidentiality test:integrity">
<description>
Protect messages from unauthorized reading or modification
</description>
Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java?rev=634975&r1=634974&r2=634975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java Sat Mar 8 06:32:10 2008
@@ -78,7 +78,7 @@
} else {
policyIntent = policyFactory.createIntent();
}
- policyIntent.setName(getQNameValue(reader, policyIntentName));
+ policyIntent.setName(new QName(policyIntentName));
if ( policyIntent instanceof ProfileIntent ) {
readRequiredIntents((ProfileIntent)policyIntent, reader);
Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=634975&r1=634974&r2=634975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java Sat Mar 8 06:32:10 2008
@@ -70,8 +70,10 @@
}
public PolicySet read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ String policySetName = reader.getAttributeValue(null, NAME);
+
PolicySet policySet = policyFactory.createPolicySet();
- policySet.setName(getQName(reader, NAME));
+ policySet.setName(new QName(policySetName));
String appliesTo = reader.getAttributeValue(null, APPLIES_TO);
String alwaysAppliesTo = reader.getAttributeValue(TUSCANY_NS, ALWAYS_APPLIES_TO);
@@ -105,7 +107,7 @@
if ( policySet.getProvidedIntents().contains(mappedIntent) ) {
readIntentMap(reader, policySet, mappedIntent);
} else {
- throw new ContributionReadException("Intent Map provides for Intent not spcified as provided by parent PolicySet - " +policySet.getName());
+ throw new ContributionReadException("Intent Map provides for Intent not spcified as provided by parent PolicySet - " + policySetName);
}
} else if ( POLICY_SET_REFERENCE_QNAME.equals(name) ) {
PolicySet referredPolicySet = policyFactory.createPolicySet();
Modified: incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java?rev=634975&r1=634974&r2=634975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java Sat Mar 8 06:32:10 2008
@@ -66,7 +66,8 @@
Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
Map<QName, IntentAttachPointType> bindingTypesTable = new Hashtable<QName, IntentAttachPointType>();
Map<QName, IntentAttachPointType> implTypesTable = new Hashtable<QName, IntentAttachPointType>();
- public static final String namespace = "http://www.osoa.org/xmlns/sca/1.0";
+ public static final String scaNamespace = "http://www.osoa.org/xmlns/sca/1.0";
+ public static final String namespace = "http://test";
private static final QName secureWsPolicy = new QName(namespace, "SecureWSPolicy");
private static final QName confidentiality = new QName(namespace, "confidentiality");
@@ -78,8 +79,8 @@
private static final QName secureMessagingPolicies = new QName(namespace, "SecureMessagingPolicies");
private static final QName securityPolicy = new QName(namespace, "SecurityPolicy");
private static final QName basicAuthMsgProtSecurity = new QName(namespace, "BasicAuthMsgProtSecurity");
- private static final QName wsBinding = new QName(namespace, "binding.ws");
- private static final QName javaImpl = new QName(namespace, "implementation.java");
+ private static final QName wsBinding = new QName(scaNamespace, "binding.ws");
+ private static final QName javaImpl = new QName(scaNamespace, "implementation.java");
@Override
@@ -111,9 +112,16 @@
Object artifact = staxProcessor.read(reader);
if ( artifact instanceof PolicySet ) {
PolicySet policySet = (PolicySet)artifact;
+ policySet.setName(new QName(namespace, policySet.getName().getLocalPart()));
policySetTable.put(policySet.getName(), policySet);
} else if ( artifact instanceof Intent ) {
Intent intent = (Intent)artifact;
+ intent.setName(new QName(namespace, intent.getName().getLocalPart()));
+ if ( intent instanceof QualifiedIntent ) {
+ ((QualifiedIntent)intent).getQualifiableIntent().
+ setName(new QName(namespace,
+ ((QualifiedIntent)intent).getQualifiableIntent().getName().getLocalPart()));
+ }
intentTable.put(intent.getName(), intent);
} else if ( artifact instanceof BindingTypeImpl ) {
IntentAttachPointType bindingType = (IntentAttachPointType)artifact;
Modified: incubator/tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml?rev=634975&r1=634974&r2=634975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml Sat Mar 8 06:32:10 2008
@@ -19,14 +19,48 @@
-->
<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://test"
+ xmlns:test="http://test"
xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="logging"
- mayProvide="tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="confidentiality"
- mayProvide="integrity"/>
-
+<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
+ mayProvide="test:tracing"/>
+<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
+ mayProvide="test:integrity"/>
+
+<!-- Intents and Policysets to assume targetnamespace -->
+<intent name="TestIntentOne"
+ constrains="sca:binding"
+ >
+ <description>
+ Test Intent
+ </description>
+ </intent>
+
+ <intent name="TestIntentTwo"
+ constrains="sca:binding"
+ requires="TestIntentOne">
+ <description>
+ Protect messages from unauthorized reading or modification
+ </description>
+ </intent>
+
+ <policySet name="TestPolicySetOne"
+ provides="test:TestIntentOne"
+ appliesTo="sca:binding.ws"
+ xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:PolicyAttachment>
+ <!-- policy expression and policy subject for
+ "basic authentication" -->
+ </wsp:PolicyAttachment>
+ <wsp:PolicyAttachment>
+ <!-- policy expression and policy subject for
+ "reliability" -->
+ </wsp:PolicyAttachment>
+ </policySet>
+
+
<!-- qualified intents -->
<intent name="confidentiality.transport" />
<intent name="confidentiality.message" />
@@ -35,7 +69,7 @@
<!-- POLICY SETS -->
<policySet name="SecureReliablePolicy"
- provides="confidentiality.transport integrity"
+ provides="test:confidentiality.transport test:integrity"
appliesTo="sca:binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
@@ -50,11 +84,11 @@
</policySet>
<policySet name="SecureMessagingPolicies"
- provides="confidentiality"
+ 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="confidentiality" default="transport">
+ <intentMap provides="test:confidentiality" default="transport">
<qualifier name="transport">
<wsp:PolicyAttachment>
<!-- policy expression and policy subject for "transport" alternative -->
@@ -69,10 +103,10 @@
</intentMap>
</policySet>
-<policySet name="SecurityPolicy" provides="confidentiality"
+<policySet name="SecurityPolicy" provides="test:confidentiality"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
- <intentMap provides="confidentiality" default="message">
+ <intentMap provides="test:confidentiality" default="message">
<qualifier name="message">
<intentMap provides="message" default="whole">
<qualifier name="body">
@@ -96,15 +130,15 @@
</policySet>
<policySet name="BasicAuthMsgProtSecurity"
- provides="authentication confidentiality"
+ provides="test:authentication test:confidentiality"
appliesTo="binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <policySetReference name="AuthenticationPolicies"/>
- <policySetReference name="ConfidentialityPolicies"/>
+ <policySetReference name="test:AuthenticationPolicies"/>
+ <policySetReference name="test:ConfidentialityPolicies"/>
</policySet>
<policySet name="AuthenticationPolicies"
- provides="authentication"
+ provides="test:authentication"
appliesTo="binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
@@ -115,11 +149,11 @@
</policySet>
<policySet name="ConfidentialityPolicies"
- provides="confidentiality"
+ provides="test:confidentiality"
bindings="binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <intentMap provides="confidentiality" default="transport">
+ <intentMap provides="test:confidentiality" default="transport">
<qualifier name="transport">
<wsp:PolicyAttachment>
<!-- policy expression and policy subject for "transport"
@@ -137,7 +171,7 @@
</policySet>
<policySet name="SecureWSPolicy"
- provides="confidentiality"
+ provides="test:confidentiality"
appliesTo="sca:binding.ws"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
@@ -164,7 +198,7 @@
<!-- profile intent -->
<intent name="reliableMessageProtection"
constrains="sca:binding"
- requires="messageProtection">
+ requires="test:messageProtection">
<description>
Protect messages from unauthorized reading or modification
</description>
@@ -172,7 +206,7 @@
<intent name="messageProtection"
constrains="sca:binding"
- requires="confidentiality integrity">
+ requires="test:confidentiality test:integrity">
<description>
Protect messages from unauthorized reading or modification
</description>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org