diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/builder')
9 files changed, 19 insertions, 19 deletions
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java index 46ff781847..df8c16c6b3 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java @@ -74,7 +74,7 @@ import org.xml.sax.InputSource; * @version $Rev$ $Date$ */ public class ComponentBuilderImpl { - protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903"; + protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912"; protected static final String BINDING_SCA = "binding.sca"; protected static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA); diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java index ef569222ae..36b8c2ac40 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java @@ -62,7 +62,7 @@ import org.apache.tuscany.sca.policy.PolicySubject; public class CompositeComponentTypeBuilderImpl { private static final Logger logger = Logger.getLogger(CompositeComponentTypeBuilderImpl.class.getName()); - protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903"; + protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912"; protected static final String BINDING_SCA = "binding.sca"; protected static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA); diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite index d6082a936d..0e7aad877e 100644 --- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite +++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://sample" xmlns:sample="http://sample" name="Calculator"> diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite index 105a478842..584f27eea7 100644 --- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite +++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://sample" xmlns:sample="http://sample" name="Composite1"> diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite index d3d5bafdfc..12cf984b88 100644 --- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite +++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://sample" xmlns:sample="http://sample" name="Composite2"> diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite index 12aa35b694..e6be99195e 100644 --- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite +++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://sample" xmlns:sample="http://sample" name="Composite3"> diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite index 141ff2a4ea..02167e43cf 100644 --- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite +++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://sample" xmlns:sample="http://sample" name="Composite4"> diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml index fe76d0038a..5b22d5b596 100644 --- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml +++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml @@ -18,10 +18,10 @@ * under the License. --> <definitions - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://sample" xmlns:sample="http://sample" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"> + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"> <policySet name="PolicySet1" appliesTo="sca:implementation.java" attachTo = "//composite[@name='']"> diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml index dac8e384e3..dc7f5c422c 100644 --- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml +++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://test" - xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"> +<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://test" + xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"> <!-- Extension Types Metadata --> <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" /> @@ -39,7 +39,7 @@ <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws" attachTo = "//sca:component[@name='CalculatorServiceComponent']/sca:reference[@name='addService']" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> <wsp:PolicyAttachment> <!-- policy expression and policy subject for "basic authentication" --> @@ -52,7 +52,7 @@ <!-- POLICY SETS --> <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> <wsp:PolicyAttachment> <!-- policy expression and policy subject for "basic authentication" --> @@ -64,7 +64,7 @@ </policySet> <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> <intentMap provides="test:confidentiality"> <qualifier name="transport"> <wsp:PolicyAttachment> @@ -81,7 +81,7 @@ </policySet> <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> <intentMap provides="test:confidentiality"> <qualifier name="message"> <wsp:PolicyAttachment> @@ -100,13 +100,13 @@ </policySet> <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"> + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"> <policySetReference name="test:AuthenticationPolicies" /> <policySetReference name="test:ConfidentialityPolicies" /> </policySet> <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> <wsp:PolicyAttachment> <!-- policy expression and policy subject for "basic authentication" --> @@ -114,7 +114,7 @@ </policySet> <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> <intentMap provides="test:confidentiality"> <qualifier name="transport"> <wsp:PolicyAttachment> @@ -134,7 +134,7 @@ </policySet> <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext" + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> <wsp:Policy> <wsp:ExactlyOne> |