From f80e186c6c412fd31801f211b75625cfd1a096d6 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 6 Mar 2009 04:39:35 +0000
Subject: [PATCH] Updating to the latest set of XSDs released by OASIS
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@750766 13f79535-47bb-0310-9956-ffa450edef68
---
.../src/main/resources/sca-1.1-cd03.xsd | 33 +++
.../main/resources/sca-1.1-schema-200803.xsd | 29 ---
.../resources/sca-binding-jca-1.1-cd02.xsd | 167 ++++++++++++
.../resources/sca-binding-jms-1.1-cd02.xsd | 160 ++++++++++++
.../resources/sca-binding-sca-1.1-cd03.xsd | 20 ++
.../sca-binding-sca-1.1-schema-200803.xsd | 18 --
.../resources/sca-binding-ws-1.1-cd02.xsd | 36 +++
...0803.xsd => sca-contribution-1.1-cd03.xsd} | 20 +-
.../resources/sca-contribution-c-1.1-cd02.xsd | 5 +-
....xsd => sca-contribution-cpp-1.1-cd02.xsd} | 5 +-
...chema-200803.xsd => sca-core-1.1-cd03.xsd} | 199 +++++++++-----
...00803.xsd => sca-definitions-1.1-cd03.xsd} | 6 +-
.../sca-implementation-bpel-1.1-cd02.xsd | 31 +++
.../sca-implementation-c-1.1-cd02.xsd | 5 +-
...sca-implementation-composite-1.1-cd03.xsd} | 11 +-
.../sca-implementation-cpp-1.1-cd02.xsd | 7 +-
...d => sca-implementation-java-1.1-cd01.xsd} | 11 +-
.../resources/sca-interface-c-1.1-cd02.xsd | 7 +-
.../resources/sca-interface-cpp-1.1-cd02.xsd | 7 +-
...03.xsd => sca-interface-java-1.1-cd03.xsd} | 14 +-
...03.xsd => sca-interface-wsdl-1.1-cd03.xsd} | 14 +-
...ema-200803.xsd => sca-policy-1.1-cd02.xsd} | 2 +-
...ca-policy-1.1-intents-definitions-cd02.xml | 243 ++++++++++++++++++
.../resources/tuscany-sca-1.1-binding-dwr.xsd | 2 +-
.../tuscany-sca-1.1-binding-http.xsd | 2 +-
.../tuscany-sca-1.1-binding-jsonrpc.xsd | 2 +-
.../resources/tuscany-sca-1.1-binding-rmi.xsd | 2 +-
.../tuscany-sca-1.1-implementation-node.xsd | 2 +-
.../src/main/resources/tuscany-sca-1.1.xsd | 2 +-
29 files changed, 901 insertions(+), 161 deletions(-)
create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-schema-200803.xsd
create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-schema-200803.xsd
create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-contribution-1.1-schema-200803.xsd => sca-contribution-1.1-cd03.xsd} (80%)
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-contribution-cpp-1-1-cd02.xsd => sca-contribution-cpp-1.1-cd02.xsd} (80%)
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-core-1.1-schema-200803.xsd => sca-core-1.1-cd03.xsd} (76%)
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-definitions-1.1-schema-200803.xsd => sca-definitions-1.1-cd03.xsd} (83%)
create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-implementation-composite-1.1-schema-200803.xsd => sca-implementation-composite-1.1-cd03.xsd} (69%)
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-implementation-java-1.1-schema-200803.xsd => sca-implementation-java-1.1-cd01.xsd} (71%)
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-interface-java-1.1-schema-200803.xsd => sca-interface-java-1.1-cd03.xsd} (60%)
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-interface-wsdl-1.1-schema-200803.xsd => sca-interface-wsdl-1.1-cd03.xsd} (60%)
rename java/sca/modules/assembly-xsd/src/main/resources/{sca-policy-1.1-schema-200803.xsd => sca-policy-1.1-cd02.xsd} (95%)
create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
new file mode 100644
index 0000000000..d93cbd6c6b
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+
+ <include schemaLocation="sca-interface-java-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-interface-wsdl-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-interface-cpp-1.1-cd02.xsd"/>
+ <include schemaLocation="sca-interface-c-1.1-cd02.xsd"/>
+
+ <include schemaLocation="sca-implementation-java-1.1-cd01.xsd"/>
+ <include schemaLocation="sca-implementation-composite-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-implementation-cpp-1.1-cd02.xsd"/>
+ <include schemaLocation="sca-implementation-c-1.1-cd02.xsd"/>
+ <include schemaLocation="sca-implementation-bpel-1.1-cd02.xsd"/>
+
+ <include schemaLocation="sca-binding-ws-1.1-cd02.xsd"/>
+ <include schemaLocation="sca-binding-jms-1.1-cd02.xsd"/>
+ <include schemaLocation="sca-binding-jca-1.1-cd02.xsd"/>
+ <include schemaLocation="sca-binding-sca-1.1-cd03.xsd"/>
+
+ <include schemaLocation="sca-definitions-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd02.xsd"/>
+
+ <include schemaLocation="sca-contribution-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-contribution-cpp-1.1-cd02.xsd"/>
+ <include schemaLocation="sca-contribution-c-1.1-cd02.xsd"/>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-schema-200803.xsd
deleted file mode 100644
index baa6317ef9..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-schema-200803.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-interface-java-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-interface-wsdl-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-interface-cpp-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-interface-c-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-implementation-java-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-implementation-composite-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-implementation-cpp-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-implementation-c-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-implementation-bpel-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-binding-webservice-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-binding-jms-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-binding-sca-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-definitions-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-policy-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-contribution-1.1-schema-200803.xsd"/>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
new file mode 100644
index 0000000000..490c9659f4
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd03.xsd" />
+
+ <complexType name="JCABinding">
+ <complexContent>
+ <extension base="sca:Binding">
+ <sequence>
+ <element name="jca.outbound.connection"
+ type="sca:JCAOutboundConnection"
+ minOccurs="0" />
+ <element name="jca.inbound.connection"
+ type="sca:JCAInboundConnection"
+ minOccurs="0" />
+ <element name="jca.outbound.interaction"
+ type="sca:JCAOutboundInteraction"
+ minOccurs="0" />
+ <element name="jca.inbound.interaction"
+ type="sca:JCAInboundInteraction"
+ minOccurs="0" />
+ <element name="property" type="sca:Property" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="connectionInfo" type="anyURI" use="optional" />
+ <attribute name="initialContextFactory"
+ type="anyURI" use="optional"/>
+ <attribute name="jndiURL" type="anyURI" use="optional"/>
+ <anyAttribute namespace="##any" processContents="lax" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <simpleType name="ResAuth">
+ <restriction base="string">
+ <enumeration value="Container" />
+ <enumeration value="Application" />
+ </restriction>
+ </simpleType>
+ <complexType name="JCAOutboundConnection">
+ <sequence>
+ <element name="resourceAdapter" type="sca:ResourceAdapter"
+ minOccurs="0" />
+ <element name="connection" type="sca:Connection" />
+ <element name="resAuth" type="sca:ResAuth" minOccurs="0" />
+ <any namespace="##other"
+ processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="managed" type="boolean" use="optional"
+ default="true" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <complexType name="JCAInboundConnection">
+ <sequence>
+ <element name="resourceAdapter" type="sca:ResourceAdapter" />
+ <element name="activationSpec" type="sca:ActivationSpec" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ </complexType>
+ <complexType name="JCAOutboundInteraction">
+ <sequence>
+ <element name="connectionSpec" type="sca:ConnectionSpec"
+ minOccurs="0" />
+ <element name="interactionSpec" type="sca:InteractionSpec"
+ minOccurs="0" />
+ <element name="operation" type="sca:Operation" minOccurs="0" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ </complexType>
+ <complexType name="JCAInboundInteraction">
+ <sequence>
+ <element name="listener" type="string" minOccurs="0" />
+ <element name="inboundOperation" type="sca:InboundOperation"
+ minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ </complexType>
+ <complexType name="ResourceAdapter">
+ <sequence>
+ <element name="property" type="sca:Property" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="name" type="NMTOKEN" use="optional" />
+ <attribute name="type" type="NMTOKEN" use="required" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <complexType name="Connection">
+ <sequence>
+ <element name="property" type="sca:Property" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="name" type="NMTOKEN" use="optional" />
+ <attribute name="type" type="NMTOKEN" use="required" />
+ <attribute name="create" type="sca:CreateResource" use="optional"
+ default="ifnotexist" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <complexType name="ActivationSpec">
+ <sequence>
+ <element name="property" type="sca:Property" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="name" type="NMTOKEN" use="optional" />
+ <attribute name="type" type="NMTOKEN" use="required" />
+ <attribute name="create" type="sca:CreateResource" use="optional"
+ default="ifnotexist" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <complexType name="Operation">
+ <sequence>
+ <element name="interactionSpec" type="sca:InteractionSpec"
+ minOccurs="0" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="name" type="NMTOKEN" use="required" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <complexType name="InboundOperation">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="name" type="NMTOKEN" use="required" />
+ <attribute name="nativeOperation" type="string" use="required" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <complexType name="ConnectionSpec">
+ <sequence>
+ <element name="property" type="sca:Property" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="type" type="NMTOKEN" use="required" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <complexType name="InteractionSpec">
+ <sequence>
+ <element name="property" type="sca:Property" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="type" type="NMTOKEN" use="required" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <element name="binding.jca" type="sca:JCABinding"
+ substitutionGroup="sca:binding" />
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
new file mode 100644
index 0000000000..6a898c7e7b
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+
+ <complexType name="JMSBinding">
+ <complexContent>
+ <extension base="sca:Binding">
+ <sequence>
+ <element name="destination" type="sca:JMSDestination" minOccurs="0"/>
+ <element name="connectionFactory" type="sca:JMSConnectionFactory"/>
+ <element name="activationSpec" type="sca:JMSActivationSpec"/>
+
+ <element name="response" type="sca:JMSResponse" minOccurs="0"/>
+ <element name="headers" type="sca:JMSHeaders" minOccurs="0"/>
+ <element name="subscriptionHeaders" type="sca:JMSSubscriptionHeaders" minOccurs="0"/>
+ <element name="resourceAdapter" type="sca:JMSResourceAdapter" minOccurs="0"/>
+ <element name="operationProperties" type="sca:JMSOperationProperties" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="correlationScheme" type="QName" default="sca:MessageId"/>
+ <attribute name="initialContextFactory" type="anyURI"/>
+ <attribute name="jndiURL" type="anyURI"/>
+ <attribute name="requestConnection" type="QName"/>
+ <attribute name="responseConnection" type="QName"/>
+ <attribute name="operationProperties" type="QName"/>
+ <anyAttribute/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="JMSDestination">
+ <sequence>
+ <element name="property" type="sca:BindingProperty" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="jndiName" type="anyURI" use="required"/>
+ <attribute name="type" use="optional" default="queue">
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="queue"/>
+ <enumeration value="topic"/>
+ </restriction>
+ </simpleType>
+ </attribute>
+ <attribute name="create" type="sca:CreateResource"
+ use="optional" default="ifnotexist"/>
+ </complexType>
+
+ <complexType name="JMSConnectionFactory">
+ <sequence>
+ <element name="property" type="sca:BindingProperty"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="jndiName" type="anyURI" use="required"/>
+ <attribute name="create" type="sca:CreateResource"
+ use="optional" default="ifnotexist"/>
+ </complexType>
+
+ <complexType name="JMSActivationSpec">
+ <sequence>
+ <element name="property" type="sca:BindingProperty"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="jndiName" type="anyURI" use="required"/>
+ <attribute name="create" type="sca:CreateResource"
+ use="optional" default="ifnotexist"/>
+ </complexType>
+
+ <complexType name="JMSResponse">
+ <sequence>
+ <element name="destination" type="sca:JMSDestination" minOccurs="0"/>
+ <choice minOccurs="0">
+ <element name="connectionFactory" type="sca:JMSConnectionFactory"/>
+ <element name="activationSpec" type="sca:JMSActivationSpec"/>
+ </choice>
+ </sequence>
+ </complexType>
+
+ <complexType name="JMSHeaders">
+ <sequence>
+ <element name="property" type="sca:BindingProperty"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="JMSType" type="string"/>
+ <attribute name="JMSDeliveryMode">
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="PERSISTENT"/>
+ <enumeration value="NON_PERSISTENT"/>
+ </restriction>
+ </simpleType>
+ </attribute>
+ <attribute name="JMSTimeToLive" type="long"/>
+ <attribute name="JMSPriority">
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="0"/>
+ <enumeration value="1"/>
+ <enumeration value="2"/>
+ <enumeration value="3"/>
+ <enumeration value="4"/>
+ <enumeration value="5"/>
+ <enumeration value="6"/>
+ <enumeration value="7"/>
+ <enumeration value="8"/>
+ <enumeration value="9"/>
+ </restriction>
+ </simpleType>
+ </attribute>
+ </complexType>
+
+ <complexType name="JMSSubscriptionHeaders">
+ <sequence>
+ <element name="property" type="sca:BindingProperty"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="JMSSelector" type="string"/>
+ </complexType>
+
+ <complexType name="JMSResourceAdapter">
+ <sequence>
+ <element name="property" type="sca:BindingProperty"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="name" type="string" use="required"/>
+ </complexType>
+
+ <complexType name="JMSOperationProperties">
+ <sequence>
+ <element name="property" type="sca:BindingProperty" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="headers" type="sca:JMSHeaders"/>
+ </sequence>
+ <attribute name="name" type="string" use="required"/>
+ <attribute name="nativeOperation" type="string"/>
+ </complexType>
+
+ <complexType name="BindingProperty">
+ <simpleContent>
+ <extension base="string">
+ <attribute name="name" type="NMTOKEN"/>
+ <attribute name="type" type="string" use="optional"
+ default="xs:string"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+
+ <element name="binding.jms" type="sca:JMSBinding"
+ substitutionGroup="sca:binding"/>
+
+ <element name="wireFormat.jmsdefault" type="sca:WireFormatType"
+ substitutionGroup="sca:wireFormat"/>
+
+ <element name="operationSelector.jmsdefault" type="sca:OperationSelectorType"
+ substitutionGroup="sca:operationSelector"/>
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
new file mode 100644
index 0000000000..7a6d1a903b
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+
+ <!-- SCA Binding -->
+ <element name="binding.sca" type="sca:SCABinding"
+ substitutionGroup="sca:binding"/>
+ <complexType name="SCABinding">
+ <complexContent>
+ <extension base="sca:Binding"/>
+ </complexContent>
+ </complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-schema-200803.xsd
deleted file mode 100644
index 6a9f3910a0..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-schema-200803.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <!-- SCA Binding -->
- <element name="binding.sca" type="sca:SCABinding" substitutionGroup="sca:binding"/>
- <complexType name="SCABinding">
- <complexContent>
- <extension base="sca:Binding"/>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
new file mode 100644
index 0000000000..17ce185d14
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ elementFormDefault="qualified">
+
+ <import namespace="http://www.w3.org/ns/wsdl-instance"
+ schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/>
+ <import namespace="http://www.w3.org/2005/08/addressing"
+ schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
+
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+
+ <element name="binding.ws" type="sca:WebServiceBinding"
+ substitutionGroup="sca:binding"/>
+
+ <complexType name="WebServiceBinding">
+ <complexContent>
+ <extension base="sca:Binding">
+ <sequence>
+ <element name="endpointReference" type="wsa:EndpointReferenceType"
+ minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="wsdlElement" type="anyURI" use="optional"/>
+ <attribute ref="wsdli:wsdlLocation" use="optional"/>
+ <anyAttribute namespace="##any" processContents="lax"/>
+ </extension>
+ </complexContent>
+ </complexType>
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
similarity index 80%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-schema-200803.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
index eea0020a38..17c2dd8285 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
<!-- Contribution -->
<element name="contribution" type="sca:ContributionType"/>
@@ -13,10 +14,14 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <element name="deployable" type="sca:DeployableType" maxOccurs="unbounded"/>
- <element ref="sca:importBase" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="sca:exportBase" minOccurs="0" maxOccurs="unbounded"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="deployable" type="sca:DeployableType"
+ maxOccurs="unbounded"/>
+ <element ref="sca:importBase" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <element ref="sca:exportBase" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
</extension>
</complexContent>
@@ -27,7 +32,8 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="composite" type="QName" use="required"/>
</extension>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
index ce2771d371..4397834520 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-contribution-1.1-schema-200803.xsd" />
+ <include schemaLocation="sca-contribution-1.1-cd03.xsd" />
<element name="export.c" type="sca:CExport"
substitutionGroup="sca:exportBase" />
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1-1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
similarity index 80%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1-1-cd02.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
index bf43db5800..2271b780ee 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1-1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-contribution-1.1-schema-200803.xsd" />
+ <include schemaLocation="sca-contribution-1.1-cd03.xsd" />
<element name="export.cpp" type="sca:CPPExport"
substitutionGroup="sca:exportBase" />
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd
similarity index 76%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-schema-200803.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd
index 97d90db1c3..6c9e75c9df 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd
@@ -6,12 +6,14 @@
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+ <import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://www.w3.org/2001/xml.xsd"/>
<!-- Common extension base for SCA definitions -->
<complexType name="CommonExtensionBase">
<sequence>
- <element ref="sca:documentation" minOccurs="0" maxOccurs="unbounded"/>
+ <element ref="sca:documentation" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
@@ -19,7 +21,8 @@
<element name="documentation" type="sca:Documentation"/>
<complexType name="Documentation" mixed="true">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute ref="xml:lang"/>
</complexType>
@@ -33,10 +36,12 @@
<element ref="sca:implementation" minOccurs="0"/>
<choice minOccurs="0" maxOccurs="unbounded">
<element name="service" type="sca:ComponentService"/>
- <element name="reference" type="sca:ComponentTypeReference"/>
+ <element name="reference"
+ type="sca:ComponentTypeReference"/>
<element name="property" type="sca:Property"/>
</choice>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="constrainingType" type="QName" use="optional"/>
</extension>
@@ -49,7 +54,8 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <element name="include" type="anyURI" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="include" type="anyURI" minOccurs="0"
+ maxOccurs="unbounded"/>
<choice minOccurs="0" maxOccurs="unbounded">
<element name="service" type="sca:Service"/>
<element name="property" type="sca:Property"/>
@@ -57,15 +63,20 @@
<element name="reference" type="sca:Reference"/>
<element name="wire" type="sca:Wire"/>
</choice>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="name" type="NCName" use="required"/>
<attribute name="targetNamespace" type="anyURI" use="required"/>
- <attribute name="local" type="boolean" use="optional" default="false"/>
- <attribute name="autowire" type="boolean" use="optional" default="false"/>
+ <attribute name="local" type="boolean" use="optional"
+ default="false"/>
+ <attribute name="autowire" type="boolean" use="optional"
+ default="false"/>
<attribute name="constrainingType" type="QName" use="optional"/>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames"
+ use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -76,13 +87,17 @@
<extension base="sca:CommonExtensionBase">
<sequence>
<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
- <element ref="sca:binding" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="sca:binding" minOccurs="0"
+ maxOccurs="unbounded" />
<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
</sequence>
<attribute name="name" type="NCName" use="required" />
- <attribute name="requires" type="sca:listOfQNames" use="optional" />
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional" />
+ <attribute name="policySets" type="sca:listOfQNames"
+ use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -100,7 +115,13 @@
<element name="interface" type="sca:Interface" abstract="true"/>
<complexType name="Interface" abstract="true">
<complexContent>
- <extension base="sca:CommonExtensionBase"/>
+ <extension base="sca:CommonExtensionBase">
+ <attribute name="remotable" type="boolean" use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames"
+ use="optional"/>
+ </extension>
</complexContent>
</complexType>
@@ -109,10 +130,14 @@
<complexContent>
<extension base="sca:Contract">
<attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- <attribute name="promote" type="sca:listOfAnyURIs" use="required"/>
+ <attribute name="target" type="sca:listOfAnyURIs"
+ use="optional"/>
+ <attribute name="wiredByImpl" type="boolean" use="optional"
+ default="false"/>
+ <attribute name="multiplicity" type="sca:Multiplicity"
+ use="optional" default="1..1"/>
+ <attribute name="promote" type="sca:listOfAnyURIs"
+ use="required"/>
</extension>
</complexContent>
</complexType>
@@ -126,7 +151,7 @@
i.e. no element-based extension point under "sca:property" -->
</sequence>
<!-- mixed="true" to handle simple type -->
- <attribute name="requires" type="sca:listOfQNames" use="optional" />
+ <attribute name="requires" type="sca:listOfQNames" use="optional"/>
<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
</complexType>
@@ -136,8 +161,10 @@
<attribute name="name" type="NCName" use="required"/>
<attribute name="type" type="QName" use="optional"/>
<attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional" default="false"/>
- <attribute name="mustSupply" type="boolean" use="optional" default="false"/>
+ <attribute name="many" type="boolean" use="optional"
+ default="false"/>
+ <attribute name="mustSupply" type="boolean" use="optional"
+ default="false"/>
<anyAttribute namespace="##any" processContents="lax"/>
</extension>
<!-- extension defines the place to hold default value -->
@@ -153,8 +180,10 @@
<attribute name="name" type="NCName" use="required"/>
<attribute name="type" type="QName" use="optional"/>
<attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional" default="false"/>
- <attribute name="mustSupply" type="boolean" use="optional" default="false"/>
+ <attribute name="many" type="boolean" use="optional"
+ default="false"/>
+ <attribute name="mustSupply" type="boolean" use="optional"
+ default="false"/>
<anyAttribute namespace="##any" processContents="lax"/>
</restriction>
</complexContent>
@@ -166,7 +195,8 @@
<attribute name="name" type="NCName" use="required"/>
<attribute name="type" type="QName" use="optional"/>
<attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional" default="false"/>
+ <attribute name="many" type="boolean" use="optional"
+ default="false"/>
<attribute name="source" type="string" use="optional"/>
<attribute name="file" type="anyURI" use="optional"/>
<anyAttribute namespace="##any" processContents="lax"/>
@@ -182,12 +212,15 @@
<extension base="sca:CommonExtensionBase">
<sequence>
<element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
- <element ref="sca:operationSelector" minOccurs="0" maxOccurs="1" />
+ <element ref="sca:operationSelector" minOccurs="0"
+ maxOccurs="1" />
</sequence>
<attribute name="uri" type="anyURI" use="optional"/>
<attribute name="name" type="NCName" use="optional"/>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames"
+ use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -198,11 +231,14 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="type" type="QName" use="required"/>
- <attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
- <attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
+ <attribute name="alwaysProvides" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="mayProvide" type="sca:listOfQNames"
+ use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -211,7 +247,8 @@
<element name="wireFormat" type="sca:WireFormatType"/>
<complexType name="WireFormatType" abstract="true">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
</sequence>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
@@ -220,7 +257,8 @@
<element name="operationSelector" type="sca:OperationSelectorType"/>
<complexType name="OperationSelectorType" abstract="true">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
</sequence>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
@@ -234,8 +272,10 @@
<element ref="sca:binding"/>
<any namespace="##other" processContents="lax"/>
</choice>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames"
+ use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -251,13 +291,16 @@
<element name="reference" type="sca:ComponentReference"/>
<element name="property" type="sca:PropertyValue"/>
</choice>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="name" type="NCName" use="required"/>
<attribute name="autowire" type="boolean" use="optional"/>
<attribute name="constrainingType" type="QName" use="optional"/>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames"
+ use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -277,7 +320,8 @@
<sequence>
<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
</sequence>
<attribute name="name" type="NCName" use="required" />
</restriction>
@@ -290,10 +334,14 @@
<complexContent>
<extension base="sca:Contract">
<attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- <attribute name="nonOverridable" type="boolean" use="optional" default="false"/>
+ <attribute name="target" type="sca:listOfAnyURIs"
+ use="optional"/>
+ <attribute name="wiredByImpl" type="boolean" use="optional"
+ default="false"/>
+ <attribute name="multiplicity" type="sca:Multiplicity"
+ use="optional" default="1..1"/>
+ <attribute name="nonOverridable" type="boolean" use="optional"
+ default="false"/>
</extension>
</complexContent>
</complexType>
@@ -305,12 +353,15 @@
<sequence>
<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" />
</sequence>
<attribute name="name" type="NCName" use="required" />
<attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
+ <attribute name="wiredByImpl" type="boolean" use="optional"
+ default="false"/>
+ <attribute name="multiplicity" type="sca:Multiplicity"
+ use="optional" default="1..1"/>
</restriction>
</complexContent>
</complexType>
@@ -320,18 +371,25 @@
<complexContent>
<restriction base="sca:ComponentReference">
<sequence>
- <element ref="sca:documentation" minOccurs="0" maxOccurs="unbounded"/>
+ <element ref="sca:documentation" minOccurs="0"
+ maxOccurs="unbounded"/>
<element ref="sca:interface" minOccurs="0"/>
- <element ref="sca:binding" minOccurs="0" maxOccurs="unbounded"/>
+ <element ref="sca:binding" minOccurs="0"
+ maxOccurs="unbounded"/>
<element ref="sca:callback" minOccurs="0"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="name" type="NCName" use="required"/>
<attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="wiredByImpl" type="boolean" use="optional"
+ default="false"/>
+ <attribute name="multiplicity" type="sca:Multiplicity"
+ use="optional" default="1..1"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames"
+ use="optional"/>
<anyAttribute namespace="##other" processContents="lax"/>
</restriction>
</complexContent>
@@ -343,8 +401,10 @@
<complexType name="Implementation" abstract="true">
<complexContent>
<extension base="sca:CommonExtensionBase">
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames"
+ use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -355,11 +415,14 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="type" type="QName" use="required"/>
- <attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
- <attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
+ <attribute name="alwaysProvides" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="mayProvide" type="sca:listOfQNames"
+ use="optional"/>
</extension>
</complexContent>
</complexType>
@@ -369,10 +432,13 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="source" type="anyURI" use="required"/>
<attribute name="target" type="anyURI" use="required"/>
+ <attribute name="replace" type="boolean" use="optional"
+ default="false"/>
</extension>
</complexContent>
</complexType>
@@ -395,10 +461,12 @@
<sequence>
<choice minOccurs="0" maxOccurs="unbounded">
<element name="service" type="sca:ConstrainingService"/>
- <element name="reference" type="sca:ConstrainingReference"/>
+ <element name="reference"
+ type="sca:ConstrainingReference"/>
<element name="property" type="sca:ConstrainingProperty"/>
</choice>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="name" type="NCName" use="required"/>
<attribute name="targetNamespace" type="anyURI"/>
@@ -440,4 +508,11 @@
<list itemType="anyURI"/>
</simpleType>
+ <simpleType name="CreateResource">
+ <restriction base="string">
+ <enumeration value="always" />
+ <enumeration value="never" />
+ <enumeration value="ifnotexist" />
+ </restriction>
+ </simpleType>
</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
similarity index 83%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-schema-200803.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
index c4796b4b0c..0feadcddcd 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-policy-1.1-schema-200803.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd02.xsd"/>
<!-- Definitions -->
<element name="definitions" type="sca:tDefinitions"/>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
new file mode 100644
index 0000000000..3c19424a83
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
+<schema
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+
+ <!-- SCA-Assembly XML Schema -->
+ <include schemaLocation="sca-core-1.1-cd03.xsd" />
+
+ <!-- SCA-BPEL Component Implementation Type -->
+ <element name="implementation.bpel"
+ type="sca:BPELImplementation" substitutionGroup="sca:implementation" />
+
+ <complexType name="BPELImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="process" type="QName" use="required" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
index b9269f7c20..11e191f0ed 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd" />
+ <include schemaLocation="sca-core-1.1-cd03.xsd" />
<element name="implementation.c" type="sca:CImplementation"
substitutionGroup="sca:implementation" />
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
similarity index 69%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-schema-200803.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
index f8b6e2e024..050f456386 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
<!-- Composite Implementation -->
- <element name="implementation.composite" type="sca:SCAImplementation" substitutionGroup="sca:implementation"/>
+ <element name="implementation.composite" type="sca:SCAImplementation"
+ substitutionGroup="sca:implementation"/>
<complexType name="SCAImplementation">
<complexContent>
<extension base="sca:Implementation">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="name" type="QName" use="required"/>
</extension>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
index e2b8c63b80..771186a91d 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd" />
+ <include schemaLocation="sca-core-1.1-cd03.xsd" />
<element name="implementation.cpp" type="sca:CPPImplementation"
substitutionGroup="sca:implementation" />
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
similarity index 71%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-schema-200803.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
index 9d6494c826..52c92e8259 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
<!-- Java Implementation -->
- <element name="implementation.java" type="sca:JavaImplementation" substitutionGroup="sca:implementation"/>
+ <element name="implementation.java" type="sca:JavaImplementation"
+ substitutionGroup="sca:implementation"/>
<complexType name="JavaImplementation">
<complexContent>
<extension base="sca:Implementation">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="class" type="NCName" use="required"/>
<anyAttribute namespace="##any" processContents="lax"/>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
index ed681093f7..f2c7d2034f 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd" />
+ <include schemaLocation="sca-core-1.1-cd03.xsd" />
<element name="interface.c" type="sca:CInterface"
substitutionGroup="sca:interface" />
@@ -24,8 +25,6 @@
<attribute name="header" type="string" use="required" />
<attribute name="callbackHeader" type="string"
use="optional" />
- <attribute name="remotable" type="boolean"
- use="optional" />
<anyAttribute namespace="##other" processContents="lax" />
</extension>
</complexContent>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
index 6583db00b6..c214f7c37b 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd" />
+ <include schemaLocation="sca-core-1.1-cd03.xsd" />
<element name="interface.cpp" type="sca:CPPInterface"
substitutionGroup="sca:interface" />
@@ -27,8 +28,6 @@
use="optional" />
<attribute name="callbackClass" type="Name"
use="optional" />
- <attribute name="remotable" type="boolean"
- use="optional" />
<anyAttribute namespace="##other" processContents="lax" />
</extension>
</complexContent>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
similarity index 60%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-schema-200803.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
index 05197c1310..6acbe6cf1c 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
@@ -1,22 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
<!-- Java Interface -->
- <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
+ <element name="interface.java" type="sca:JavaInterface"
+ substitutionGroup="sca:interface"/>
<complexType name="JavaInterface">
<complexContent>
<extension base="sca:Interface">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="interface" type="NCName" use="required"/>
- <attribute name="callbackInterface" type="NCName" use="optional"/>
+ <attribute name="callbackInterface" type="NCName"
+ use="optional"/>
<anyAttribute namespace="##any" processContents="lax"/>
</extension>
</complexContent>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
similarity index 60%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-schema-200803.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
index 40fa99daaa..f3abba888e 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
@@ -1,22 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ OASIS trademark, IPR and other policies apply. -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
<!-- WSDL Interface -->
- <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
+ <element name="interface.wsdl" type="sca:WSDLPortType"
+ substitutionGroup="sca:interface"/>
<complexType name="WSDLPortType">
<complexContent>
<extension base="sca:Interface">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
</sequence>
<attribute name="interface" type="anyURI" use="required"/>
- <attribute name="callbackInterface" type="anyURI" use="optional"/>
+ <attribute name="callbackInterface" type="anyURI"
+ use="optional"/>
<anyAttribute namespace="##any" processContents="lax"/>
</extension>
</complexContent>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
similarity index 95%
rename from java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-schema-200803.xsd
rename to java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
index ff9b43e53b..b3de95509e 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
@@ -7,7 +7,7 @@
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd03.xsd"/>
<import namespace="http://www.w3.org/ns/ws-policy"
schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
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
new file mode 100644
index 0000000000..2e96713233
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml
@@ -0,0 +1,243 @@
+<?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"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+
+ <!-- Security related intents -->
+ <intent name="serverAuthentication" constrains="sca:binding"
+ intentType="interaction">
+ <description>
+ Communication through the binding requires that the
+ server is authenticated by the client
+ </description>
+ <qualifier name="transport" default="true"/>
+ <qualifier name="message"/>
+ </intent>
+
+ <intent name="clientAuthentication" constrains="sca:binding"
+ intentType="interaction">
+ <description>
+ Communication through the binding requires that the
+ client is authenticated by the server
+ </description>
+ <qualifier name="transport" default="true"/>
+ <qualifier name="message"/>
+ </intent>
+
+ <intent name="authentication" requires="clientAuthentication">
+ <description>
+ A convenience intent to help migration
+ </description>
+ </intent>
+
+ <intent name="mutualAuthentication"
+ requires="clientAuthentication serverAuthentication">
+ <description>
+ Communication through the binding requires that the
+ client and server to authenticate each other
+ </description>
+ </intent>
+
+ <intent name="confidentiality" constrains="sca:binding"
+ intentType="interaction">
+ <description>
+ Communication through the binding prevents unauthorized
+ users from reading the messages
+ </description>
+ <qualifier name="transport" default="true"/>
+ <qualifier name="message"/>
+ </intent>
+
+ <intent name="integrity" constrains="sca:binding"
+ intentType="interaction">
+ <description>
+ Communication through the binding prevents tampering
+ with the messages sent between the client and the service.
+ </description>
+ <qualifier name="transport" default="true"/>
+ <qualifier name="message"/>
+ </intent>
+
+ <intent name="authorization" constrains="sca:implementation"
+ intentType="implementation">
+ <description>
+ Ensures clients are authorized to use services.
+ </description>
+ <qualifier name="fineGrain" default="true"/>
+ </intent>
+
+
+ <!-- Reliable messaging related intents -->
+ <intent name="atLeastOnce" constrains="sca:binding"
+ intentType="interaction">
+ <description>
+ This intent is used to indicate that a message sent
+ by a client is always delivered to the component.
+ </description>
+ </intent>
+
+ <intent name="atMostOnce" constrains="sca:binding"
+ intentType="interaction">
+ <description>
+ This intent is used to indicate that a message that was
+ successfully sent by a client is not delivered more than
+ once to the component.
+ </description>
+ </intent>
+
+ <intent name="exactlyOnce" requires="atLeastOnce atMostOnce"
+ constrains="sca:binding" intentType="interaction">
+ <description>
+ This profile intent is used to indicate that a message sent
+ by a client is always delivered to the component. It also
+ indicates that duplicate messages are not delivered to the
+ component.
+ </description>
+ </intent>
+
+ <intent name="ordered" appliesTo="sca:binding"
+ intentType="interaction">
+ <description>
+ This intent is used to indicate that all the messages are
+ delivered to the component in the order they were sent by
+ the client.
+ </description>
+ </intent>
+
+ <!-- Transaction related intents -->
+ <intent name="managedTransaction" excludes="sca:noManagedTransaction"
+ mutuallyExclusive="true" constrains="sca:implementation"
+ intentType="implementation">
+ <description>
+ A managed transaction environment is necessary in order to
+ run the component. The specific type of managed transaction
+ needed is not constrained.
+ </description>
+ <qualifier name="global" default="true">
+ <description>
+ For a component marked with managedTransaction.global
+ a global transaction needs to be present before dispatching
+ any method on the component - using any transaction
+ propagated from the client or else beginning and completing
+ a new transaction.
+ </description>
+ </qualifier>
+ <qualifier name="local">
+ <description>
+ A component marked with managedTransaction.local needs to
+ run within a local transaction containment (LTC) that
+ is started and ended by the SCA runtime.
+ </description>
+ </qualifier>
+ </intent>
+
+ <intent name="noManagedTransaction" excludes="sca:managedTransaction"
+ constrains="sca:implementation" intentType="implementation">
+ <description>
+ A component marked with noManagedTransaction needs to run without
+ a managed transaction, under neither a global transaction nor
+ an LTC. A transaction propagated to the hosting SCA runtime
+ is not joined by the hosting runtime on behalf of a
+ component marked with noManagedtransaction.
+ </description>
+ </intent>
+
+ <intent name="transactedOneWay" excludes="sca:immediateOneWay"
+ constrains="sca:binding" intentType="implementation">
+ <description>
+ For a reference marked as transactedOneWay any OneWay invocation
+ messages are transacted as part of a client global
+ transaction.
+ For a service marked as transactedOneWay any OneWay invocation
+ message are received from the transport binding in a
+ transacted fashion, under the service’s global transaction.
+ </description>
+ </intent>
+
+ <intent name="immediateOneWay" excludes="transactedOneWay"
+ constrains="sca:binding" intentType="implementation">
+ <description>
+ For a reference indicates that any OneWay invocation messages
+ are sent immediately regardless of any client transaction.
+ For a service indicates that any OneWay invocation is
+ received immediately regardless of any target service
+ transaction.
+ </description>
+ </intent>
+
+ <intent name="propagatesTransaction" excludes="suspendsTransaction"
+ constrains="sca:binding" intentType="interaction">
+ <description>
+ A service marked with propagatesTransaction is dispatched
+ under any propagated (client) transaction and the service binding
+ needs to be capable of receiving a transaction context.
+ A reference marked with propagatesTransaction propagates any
+ transaction context under which the client runs when the
+ reference is used for a request-response interaction and the
+ binding of a reference marked with propagatesTransaction needs to
+ be capable of propagating a transaction context.
+ </description>
+ </intent>
+
+ <intent name="suspendsTransaction" excludes="propagatesTransaction"
+ constrains="sca:binding" intentType="interaction">
+ <description>
+ A service marked with suspendsTransaction is not dispatched
+ under any propagated (client) transaction.
+ A reference marked with suspendsTransaction does not propagate
+ any transaction context under which the client runs when the
+ reference is used.
+ </description>
+ </intent>
+
+ <intent name="managedSharedTransaction"
+ requires="managedTransaction.global propagatesTransaction">
+ <description>
+ Used to indicate that the component requires both the
+ managedTransaction.global and the propagatesTransactions
+ intents
+ </description>
+ </intent>
+
+ <!-- Miscellaneous intents -->
+ <intent name="asyncInvocation" constrains="sca:Binding"
+ intentType="interaction">
+ <description>
+ Indicates that request/response operations for the
+ interface of this wire are "long running" and must be
+ treated as two separate message transmissions
+ </description>
+ </intent>
+
+ <intent name="SOAP" constrains="sca:binding" intentType="interaction">
+ <description>
+ Specifies that the SOAP messaging model is used for delivering
+ messages.
+ </description>
+ <qualifier name="1_1" default="true"/>
+ <qualifier name="1_2"/>
+ </intent>
+
+ <intent name="JMS" constrains="sca:binding" intentType="interaction">
+ <description>
+ Requires that the messages are delivered and received via the
+ JMS API.
+ </description>
+ </intent>
+
+ <intent name="noListener" constrains="sca:binding"
+ intentType="interaction">
+ <description>
+ This intent can only be used on a reference. Indicates that the
+ client is not able to handle new inbound connections. The binding
+ and callback binding are configured so that any
+ response or callback comes either through a back channel of the
+ connection from the client to the server or by having the client
+ poll the server for messages.
+ </description>
+ </intent>
+
+</sca: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 6c3d45c4d4..bb3ad00cd7 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
@@ -23,7 +23,7 @@
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
elementFormDefault="qualified">
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
<element name="binding.dwr" type="t:DWRBinding"/>
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 8c1efcbb63..32f2a51276 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
@@ -23,7 +23,7 @@
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
elementFormDefault="qualified">
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
<element name="binding.http" type="t:HTTPBinding"/>
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 c6a653f178..68dea85a12 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
@@ -23,7 +23,7 @@
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
elementFormDefault="qualified">
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
<element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
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 dbb50cfd2d..fadf94fffe 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
@@ -23,7 +23,7 @@
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
elementFormDefault="qualified">
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
<element name="binding.rmi" type="t:RMIBinding"/>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
index 20cb1565a8..e90d9a0fa5 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
@@ -23,7 +23,7 @@
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
elementFormDefault="qualified">
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
<element name="implementation.node" type="t:NodeImplementation"/>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index f64930e788..d3a2711ee0 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
@@ -22,7 +22,7 @@
<import namespace="http://www.w3.org/2004/08/wsdl-instance" schemaLocation="wsdli.xsd"/>
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-schema-200803.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
<include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
<include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>