diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-08-11 20:50:34 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-08-11 20:50:34 +0000 |
commit | 02ae2d84328d90d9871e057089ab0a7d93b03f17 (patch) | |
tree | 9fbb2cc803c917899e2b12e400f378067b77a9ef /java/sca/modules/assembly-xsd/src/main | |
parent | fc8f3f7d9af375bb06ac7d1f1f2ab7440ecb2d3e (diff) |
Fix the schema validation issue for definitions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@803291 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
6 files changed, 12 insertions, 11 deletions
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml index c761266148..8efde2653f 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. --> -<sca:definitions xmlns:xml="http://www.w3.org/XML/1998/namespace" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" +<definitions xmlns:xml="http://www.w3.org/XML/1998/namespace" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"> @@ -98,7 +99,7 @@ </description> </intent> - <intent name="ordered" appliesTo="sca:binding" + <intent name="ordered" constrains="sca:binding" intentType="interaction"> <description> This intent is used to indicate that all the messages are @@ -217,8 +218,8 @@ Specifies that the SOAP messaging model is used for delivering messages. </description> - <qualifier name="1_1" default="true"/> - <qualifier name="1_2"/> + <qualifier name="V1_1" default="true"/> + <qualifier name="V1_2"/> </intent> <intent name="JMS" constrains="sca:binding" intentType="interaction"> @@ -240,4 +241,4 @@ </description> </intent> -</sca:definitions> +</definitions> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd index de7bc6bdd0..e21f249ecb 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="binding.dwr" type="t:DWRBinding"/> + <element name="binding.dwr" type="t:DWRBinding" substitutionGroup="sca:binding"/> <complexType name="DWRBinding"> <complexContent> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd index ce8d47b575..4697382296 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="binding.http" type="t:HTTPBinding"/> + <element name="binding.http" type="t:HTTPBinding" substitutionGroup="sca:binding"/> <complexType name="HTTPBinding"> <complexContent> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd index 92142d117d..98e0b32834 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="binding.jsonrpc" type="t:JSONRPCBinding"/> + <element name="binding.jsonrpc" type="t:JSONRPCBinding" substitutionGroup="sca:binding"/> <complexType name="JSONRPCBinding"> <complexContent> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd index 9b15010624..a0fa641670 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="binding.rmi" type="t:RMIBinding"/> + <element name="binding.rmi" type="t:RMIBinding" substitutionGroup="sca:binding"/> <complexType name="RMIBinding"> <complexContent> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd index 0e29a09e72..dfe819d97f 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="implementation.osgi" type="t:OSGiImplementation"/> + <element name="implementation.osgi" type="t:OSGiImplementation" substitutionGroup="sca:implementation"/> <complexType name="OSGiImplementation"> <complexContent> |