diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-01 11:32:39 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-01 11:32:39 +0000 |
| commit | d632b5c39ce8538029c95ca1f3f84f3fb80ad0d9 (patch) | |
| tree | 450d3d9373b3a8da4d147c5916b8d09cb0cd8fa7 /sca-java-2.x/trunk/modules | |
| parent | d53d1514cca9d215f98a9991f7c4c5e6dd9b5053 (diff) | |
Move MTOM intent into Tuscany namespace
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@905257 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules')
2 files changed, 8 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java index a84b025172..d3f5af3f78 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java +++ b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java @@ -24,6 +24,7 @@ import java.util.List; import javax.xml.namespace.QName; import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicySubject; import org.apache.tuscany.sca.policy.PolicySet; @@ -35,10 +36,11 @@ import org.apache.tuscany.sca.policy.PolicySubject; public class AxisPolicyHelper { public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200912"; + public static final QName AUTHENTICATION_INTENT = new QName(XMLNS_SCA_11, "authentication"); public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_11, "confidentiality"); public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_11, "integrity"); - public static final QName MTOM_INTENT = new QName(XMLNS_SCA_11, "MTOM"); + public static final QName MTOM_INTENT = new QName(Constants.SCA11_TUSCANY_NS, "MTOM"); public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_11, "SOAP12"); public static PolicySet getPolicySet(Binding wsBinding, QName intentName) { diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml index 17a9a543a2..0061354446 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml +++ b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml @@ -21,17 +21,17 @@ <!-- $Rev$ $Date$ --> <sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> + targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> <sca:bindingType type="sca:binding.ws" mayProvide="SOAP SOAP.V1_1 SOAP.V1_2 MTOM" alwaysProvides=""/> - <!-- PolicyIntents defined by the SCA Runtime Extension for WS Binding Axis 2 --> - + <!-- binding.ws defined by OASIS --> <!-- see the file sca-policy-1.1-intents-definitions.xml in the --> <!-- assembly-xsd module for spec defined intents --> + <!-- binding.ws defined by Tuscany --> <sca:intent name="MTOM" constrains="sca:binding.ws"> <sca:description> Communication through this binding requires MTOM support |