summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoredwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>2009-08-05 22:03:18 +0000
committeredwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>2009-08-05 22:03:18 +0000
commit296998d19b12f9b844cb7ac4fdfb98700e5e76ed (patch)
tree7c42e019476fd118fe2fd0c87ac48b621d0b0ad2
parentabfb08f4d23730ca79156fcec9752637f8180e3c (diff)
Updated to match latest OASIS XSDs which contain fixes for problems which are affecting Tuscany - sca-1.1-cd03.xsd updated to use these new files. As required by TUSCANY 3192.
- additional changes required to make all files work together. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@801434 13f79535-47bb-0310-9956-ffa450edef68
Diffstat
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd44
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd36
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd167
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd173
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd)338
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd)40
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd)9
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd)14
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd)70
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd)68
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd)2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd26
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd)62
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd31
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd3
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd)112
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd)52
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd)106
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd27
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd)3
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd)82
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd)84
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd)2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd29
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd (renamed from java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd)206
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd2
-rw-r--r--java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd2
33 files changed, 876 insertions, 926 deletions
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
deleted file mode 100644
index b2f36a871c..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
+++ /dev/null
@@ -1,44 +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">
-
- <!-- Updated 5th August 2009 to point to updated versions of the OASIS XSDs
- - done because the new files fix errors in the older files which cause
- problems in Tuscany
- - this file will be replaced as a whole when OASIS updates this file
- -->
-
- <include schemaLocation="sca-core-1.1-cd04.xsd"/> <!-- Was CD03 -->
-
- <include schemaLocation="sca-interface-java-1.1-cd03.xsd"/>
- <include schemaLocation="sca-interface-wsdl-1.1-cd04.xsd"/> <!-- Was CD03 -->
- <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-cd03.xsd"/> <!-- Was CD01 -->
- <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-cd03.xsd"/> <!-- Was CD02 -->
- <include schemaLocation="sca-implementation-spring-1.1.xsd"/>
-
- <include schemaLocation="sca-binding-ws-1.1-cd02.xsd"/>
- <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/> <!-- New -->
- <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"/>
- <include schemaLocation="sca-contribution-java-1.1-cd01.xsd"/>
-
- <include schemaLocation="sca-jee-1.1-wd03.xsd"/>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
new file mode 100644
index 0000000000..8d177fc768
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.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">
+
+ <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+
+ <include schemaLocation="sca-interface-java-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-interface-wsdl-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-interface-c-1.1-cd04.xsd"/>
+
+ <include schemaLocation="sca-implementation-java-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-implementation-composite-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-implementation-cpp-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-implementation-c-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-implementation-bpel-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-implementation-spring-1.1-cd01.xsd"/>
+
+ <include schemaLocation="sca-binding-ws-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/> <!-- New -->
+ <include schemaLocation="sca-binding-jms-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-binding-jca-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-binding-sca-1.1-cd04.xsd"/>
+
+ <include schemaLocation="sca-definitions-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
+
+ <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-contribution-cpp-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-contribution-c-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-contribution-java-1.1-cd02.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
deleted file mode 100644
index 490c9659f4..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
+++ /dev/null
@@ -1,167 +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"
- 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-jca-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
new file mode 100644
index 0000000000..7f9baac45c
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
@@ -0,0 +1,173 @@
+<?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-cd04.xsd"/>
+
+ <complexType name="JCABinding">
+ <complexContent>
+ <extension base="sca:Binding">
+ <sequence>
+ <element name="outboundConnection"
+ type="sca:JCAOutboundConnection" minOccurs="0" />
+ <element name="inboundConnection"
+ type="sca:JCAInboundConnection" minOccurs="0" />
+ <element name="outboundInteraction"
+ type="sca:JCAOutboundInteraction" minOccurs="0" />
+ <element name="inboundInteraction"
+ 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"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <simpleType name="JCACreateResource">
+ <restriction base="string">
+ <enumeration value="always" />
+ <enumeration value="never" />
+ <enumeration value="ifNotExist" />
+ </restriction>
+ </simpleType>
+ <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="##other" 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>
+ <anyAttribute namespace="##other" processContents="lax" />
+ </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>
+ <anyAttribute namespace="##other" processContents="lax" />
+ </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>
+ <anyAttribute namespace="##other" processContents="lax" />
+ </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="##other" 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:JCACreateResource" use="optional"
+ default="ifNotExist" />
+ <anyAttribute namespace="##other" 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:JCACreateResource" use="optional"
+ default="ifNotExist"/>
+ <anyAttribute namespace="##other" 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="##other" 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="##other" 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="##other" 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="##other" 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-cd04.xsd
index 6a898c7e7b..e16039a0cd 100644
--- 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-cd04.xsd
@@ -1,160 +1,178 @@
-<?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>
+<?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-cd04.xsd"/>
+
+ <complexType name="JMSBinding">
+ <complexContent>
+ <extension base="sca:Binding">
+ <sequence>
+ <element name="destination" type="sca:JMSDestination"
+ minOccurs="0"/>
+ <choice minOccurs="0" maxOccurs="1">
+ <element name="connectionFactory"
+ type="sca:JMSConnectionFactory"/>
+ <element name="activationSpec" type="sca:JMSActivationSpec"/>
+ </choice>
+ <element name="response" type="sca:JMSResponse" minOccurs="0"/>
+ <element name="headers" type="sca:JMSHeaders" minOccurs="0"/>
+ <element name="messageSelection" type="sca:JMSMessageSelection"
+ 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"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <simpleType name="JMSCreateResource">
+ <restriction base="string">
+ <enumeration value="always"/>
+ <enumeration value="never"/>
+ <enumeration value="ifNotExist"/>
+ </restriction>
+ </simpleType>
+
+ <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:JMSCreateResource"
+ 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:JMSCreateResource"
+ 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:JMSCreateResource"
+ use="optional" default="ifNotExist"/>
+ </complexType>
+
+ <complexType name="JMSResponse">
+ <sequence>
+ <element name="wireFormat" type="sca:WireFormatType" minOccurs="0"/>
+ <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="type" type="string"/>
+ <attribute name="deliveryMode">
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="persistent"/>
+ <enumeration value="nonpersistent"/>
+ </restriction>
+ </simpleType>
+ </attribute>
+ <attribute name="timeToLive" type="long"/>
+ <attribute name="priority">
+ <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="JMSMessageSelection">
+ <sequence>
+ <element name="property" type="sca:BindingProperty"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="selector" 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> \ No newline at end of file
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-cd04.xsd
index 7a6d1a903b..897e869806 100644
--- 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-cd04.xsd
@@ -1,20 +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>
+<?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-cd04.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-cd04.xsd
index bae52390fa..24198c943d 100644
--- 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-cd04.xsd
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. 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"
+<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"
@@ -13,7 +13,7 @@
<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"/>
+ <include schemaLocation="sca-core-1.1-cd04.xsd"/>
<element name="binding.ws" type="sca:WebServiceBinding"
substitutionGroup="sca:binding"/>
@@ -29,7 +29,6 @@
</sequence>
<attribute name="wsdlElement" type="anyURI" use="optional"/>
<attribute ref="wsdli:wsdlLocation" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
</extension>
</complexContent>
</complexType>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
index 8445749363..f13fbd1567 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
@@ -6,7 +6,7 @@
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd04.xsd"/>
<!-- Contribution -->
<element name="contribution" type="sca:ContributionType"/>
@@ -46,13 +46,15 @@
<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>
</extension>
</complexContent>
</complexType>
- <element name="import" type="sca:ImportType" substitutionGroup="sca:importBase"/>
+ <element name="import" type="sca:ImportType"
+ substitutionGroup="sca:importBase"/>
<complexType name="ImportType">
<complexContent>
<extension base="sca:Import">
@@ -68,13 +70,15 @@
<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>
</extension>
</complexContent>
</complexType>
- <element name="export" type="sca:ExportType" substitutionGroup="sca:exportBase"/>
+ <element name="export" type="sca:ExportType"
+ substitutionGroup="sca:exportBase"/>
<complexType name="ExportType">
<complexContent>
<extension base="sca:Export">
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-cd04.xsd
index 4397834520..7e2cd739fd 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-cd04.xsd
@@ -1,35 +1,35 @@
-<?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-contribution-1.1-cd03.xsd" />
-
- <element name="export.c" type="sca:CExport"
- substitutionGroup="sca:exportBase" />
-
- <complexType name="CExport">
- <complexContent>
- <extension base="sca:Export">
- <attribute name="name" type="QName" use="required" />
- <attribute name="path" type="string" use="optional" />
- </extension>
- </complexContent>
- </complexType>
-
- <element name="import.c" type="sca:CImport"
- substitutionGroup="sca:importBase" />
-
- <complexType name="CImport">
- <complexContent>
- <extension base="sca:Import">
- <attribute name="name" type="QName" use="required" />
- <attribute name="location" type="string" use="required" />
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2007,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-cd04.xsd" />
+
+ <element name="export.c" type="sca:CExport"
+ substitutionGroup="sca:exportBase" />
+
+ <complexType name="CExport">
+ <complexContent>
+ <extension base="sca:Export">
+ <attribute name="name" type="QName" use="required" />
+ <attribute name="path" type="string" use="optional" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="import.c" type="sca:CImport"
+ substitutionGroup="sca:importBase" />
+
+ <complexType name="CImport">
+ <complexContent>
+ <extension base="sca:Import">
+ <attribute name="name" type="QName" use="required" />
+ <attribute name="location" type="string" use="required" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+</schema>
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-cd04.xsd
index 2271b780ee..b808125568 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-cd04.xsd
@@ -1,35 +1,35 @@
-<?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-contribution-1.1-cd03.xsd" />
-
- <element name="export.cpp" type="sca:CPPExport"
- substitutionGroup="sca:exportBase" />
-
- <complexType name="CPPExport">
- <complexContent>
- <extension base="sca:Export">
- <attribute name="name" type="QName" use="required" />
- <attribute name="path" type="string" use="optional" />
- </extension>
- </complexContent>
- </complexType>
-
- <element name="import.cpp" type="sca:CPPImport"
- substitutionGroup="sca:importBase" />
-
- <complexType name="CPPImport">
- <complexContent>
- <extension base="sca:Import">
- <attribute name="name" type="QName" use="required" />
- <attribute name="location" type="string" use="required" />
- </extension>
- </complexContent>
- </complexType>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2006,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-cd04.xsd" />
+
+ <element name="export.cpp" type="sca:CPPExport"
+ substitutionGroup="sca:exportBase" />
+
+ <complexType name="CPPExport">
+ <complexContent>
+ <extension base="sca:Export">
+ <attribute name="name" type="QName" use="required" />
+ <attribute name="path" type="string" use="optional" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="import.cpp" type="sca:CPPImport"
+ substitutionGroup="sca:importBase" />
+
+ <complexType name="CPPImport">
+ <complexContent>
+ <extension base="sca:Import">
+ <attribute name="name" type="QName" use="required" />
+ <attribute name="location" type="string" use="required" />
+ </extension>
+ </complexContent>
+ </complexType>
+
</schema> \ No newline at end of file
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
index a5e0c87b22..1dcd515c98 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
@@ -5,7 +5,7 @@
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-contribution-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
<!-- Import.java -->
<element name="import.java" type="sca:JavaImportType"
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
index f9b02766cb..1e781c798e 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
@@ -54,7 +54,7 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <element name="include" type="anyURI" minOccurs="0"
+ <element ref="sca:include" minOccurs="0"
maxOccurs="unbounded"/>
<choice minOccurs="0" maxOccurs="unbounded">
<element name="service" type="sca:Service"/>
@@ -145,7 +145,8 @@
<!-- Property -->
<complexType name="SCAPropertyBase" mixed="true">
<sequence>
- <any namespace="##any" processContents="lax" minOccurs="0"/>
+ <any namespace="##any" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
<!-- NOT an extension point; This any exists to accept
the element-based or complex type property
i.e. no element-based extension point under "sca:property" -->
@@ -481,7 +482,17 @@
as having a callback interface defined in terms of a second port
type. -->
<attribute name="callback" type="anyURI"/>
-
+
+ <!-- Value type definition for property values -->
+ <element name="value" type="sca:ValueType"/>
+ <complexType name="ValueType" mixed="true">
+ <sequence>
+ <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs='unbounded'/>
+ </sequence>
+ <!-- mixed="true" to handle simple type -->
+ <anyAttribute namespace="##any" processContents="lax"/>
+ </complexType>
+
<!-- Miscellaneous simple type definitions -->
<simpleType name="Multiplicity">
<restriction base="string">
@@ -507,5 +518,12 @@
<simpleType name="listOfAnyURIs">
<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-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
index 0feadcddcd..2034e4d2c8 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
@@ -1,31 +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 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"/>
- <include schemaLocation="sca-policy-1.1-cd02.xsd"/>
-
- <!-- Definitions -->
- <element name="definitions" type="sca:tDefinitions"/>
- <complexType name="tDefinitions">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <choice minOccurs="0" maxOccurs="unbounded">
- <element ref="sca:intent"/>
- <element ref="sca:policySet"/>
- <element ref="sca:binding"/>
- <element ref="sca:bindingType"/>
- <element ref="sca:implementationType"/>
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
- </choice>
- <attribute name="targetNamespace" type="anyURI" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
+<?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-cd04.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
+
+ <!-- Definitions -->
+ <element name="definitions" type="sca:tDefinitions"/>
+ <complexType name="tDefinitions">
+ <complexContent>
+ <extension base="sca:CommonExtensionBase">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element ref="sca:intent"/>
+ <element ref="sca:policySet"/>
+ <element ref="sca:binding"/>
+ <element ref="sca:bindingType"/>
+ <element ref="sca:implementationType"/>
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </choice>
+ <attribute name="targetNamespace" type="anyURI" use="required"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+</schema>
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
deleted file mode 100644
index 3c19424a83..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
+++ /dev/null
@@ -1,31 +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
- 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-bpel-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
index 6d0e417787..11239e20d0 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
@@ -9,7 +9,7 @@
elementFormDefault="qualified">
<!-- SCA-Assembly XML Schema -->
- <include schemaLocation="sca-core-1.1-cd03.xsd" />
+ <include schemaLocation="sca-core-1.1-cd04.xsd" />
<!-- SCA-BPEL Component Implementation Type -->
<element name="implementation.bpel"
@@ -29,3 +29,4 @@
</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-cd04.xsd
index 11e191f0ed..011c7a61ea 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-cd04.xsd
@@ -1,57 +1,57 @@
<?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" />
-
- <element name="implementation.c" type="sca:CImplementation"
- substitutionGroup="sca:implementation" />
-
- <complexType name="CImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <element name="operation"
- type="sca:CImplementationFunction" minOccurs="0"
- maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="module" type="NCName" use="required" />
- <attribute name="path" type="string" use="optional" />
- <attribute name="library" type="boolean" use="optional" />
- <attribute name="componentType" type="string" use="required" />
- <attribute name="scope" type="sca:CImplementationScope"
- use="optional" />
- <attribute name="eagerInit" type="boolean"
- use="optional" />
- <attribute name="init" type="boolean" use="optional" />
- <attribute name="destoy" type="boolean" use="optional" />
- <attribute name="allowsPassByReference" type="boolean"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
- <simpleType name="CImplementationScope">
- <restriction base="string">
- <enumeration value="stateless" />
- <enumeration value="composite" />
- </restriction>
- </simpleType>
-
- <complexType name="CImplementationFunction">
- <attribute name="name" type="NCName" use="required" />
- <attribute name="allowsPassByReference" type="boolean"
- use="optional" />
- <attribute name="init" type="boolean" use="optional" />
- <attribute name="destoy" type="boolean" use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
-
-</schema>
+<!-- Copyright(C) OASIS(R) 2007,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-cd04.xsd" />
+
+ <element name="implementation.c" type="sca:CImplementation"
+ substitutionGroup="sca:implementation" />
+
+ <complexType name="CImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <element name="operation"
+ type="sca:CImplementationFunction" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="module" type="NCName" use="required" />
+ <attribute name="path" type="string" use="optional" />
+ <attribute name="library" type="boolean" use="optional" />
+ <attribute name="componentType" type="string" use="required" />
+ <attribute name="scope" type="sca:CImplementationScope"
+ use="optional" />
+ <attribute name="eagerInit" type="boolean"
+ use="optional" />
+ <attribute name="init" type="boolean" use="optional" />
+ <attribute name="destoy" type="boolean" use="optional" />
+ <attribute name="allowsPassByReference" type="boolean"
+ use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <simpleType name="CImplementationScope">
+ <restriction base="string">
+ <enumeration value="stateless" />
+ <enumeration value="composite" />
+ </restriction>
+ </simpleType>
+
+ <complexType name="CImplementationFunction">
+ <attribute name="name" type="NCName" use="required" />
+ <attribute name="allowsPassByReference" type="boolean"
+ use="optional" />
+ <attribute name="init" type="boolean" use="optional" />
+ <attribute name="destoy" type="boolean" use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
index 050f456386..e0524ee006 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
@@ -1,26 +1,26 @@
-<?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"
- 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-cd03.xsd"/>
-
- <!-- Composite 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"/>
- </sequence>
- <attribute name="name" type="QName" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
+<?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"
+ 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-cd04.xsd"/>
+
+ <!-- Composite 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"/>
+ </sequence>
+ <attribute name="name" type="QName" use="required"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+</schema>
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-cd04.xsd
index 771186a91d..777da1e8ab 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-cd04.xsd
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2006,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" />
-
- <element name="implementation.cpp" type="sca:CPPImplementation"
- substitutionGroup="sca:implementation" />
- <complexType name="CPPImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <element name="function"
- type="sca:CPPImplementationFunction" minOccurs="0"
- maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="library" type="NCName" use="required" />
- <attribute name="header" type="NCName" use="required" />
- <attribute name="path" type="string" use="optional" />
- <attribute name="class" type="Name" use="optional" />
- <attribute name="componentType" type="string"
- use="optional" />
- <attribute name="scope"
- type="sca:CPPImplementationScope" use="optional" />
- <attribute name="eagerInit" type="boolean"
- use="optional" />
- <attribute name="allowsPassByReference" type="boolean"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
- <simpleType name="CPPImplementationScope">
- <restriction base="string">
- <enumeration value="stateless" />
- <enumeration value="composite" />
- </restriction>
- </simpleType>
-
- <complexType name="CPPImplementationFunction">
- <attribute name="name" type="NCName" use="required" />
- <attribute name="allowsPassByReference" type="boolean"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
-
-</schema>
+<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-cd04.xsd" />
+
+ <element name="implementation.cpp" type="sca:CPPImplementation"
+ substitutionGroup="sca:implementation" />
+ <complexType name="CPPImplementation">
+ <complexContent>
+ <extension base="sca:Implementation">
+ <sequence>
+ <element name="function"
+ type="sca:CPPImplementationFunction" minOccurs="0"
+ maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="library" type="NCName" use="required" />
+ <attribute name="header" type="NCName" use="required" />
+ <attribute name="path" type="string" use="optional" />
+ <attribute name="class" type="Name" use="optional" />
+ <attribute name="componentType" type="string"
+ use="optional" />
+ <attribute name="scope"
+ type="sca:CPPImplementationScope" use="optional" />
+ <attribute name="eagerInit" type="boolean"
+ use="optional" />
+ <attribute name="allowsPassByReference" type="boolean"
+ use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <simpleType name="CPPImplementationScope">
+ <restriction base="string">
+ <enumeration value="stateless" />
+ <enumeration value="composite" />
+ </restriction>
+ </simpleType>
+
+ <complexType name="CPPImplementationFunction">
+ <attribute name="name" type="NCName" use="required" />
+ <attribute name="allowsPassByReference" type="boolean"
+ use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
deleted file mode 100644
index 52c92e8259..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
+++ /dev/null
@@ -1,27 +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"
- 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-cd03.xsd"/>
-
- <!-- Java 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"/>
- </sequence>
- <attribute name="class" type="NCName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
index 861778b6e3..53f6a0a51a 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
@@ -6,7 +6,7 @@
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd04.xsd"/>
<!-- Java Implementation -->
<element name="implementation.java" type="sca:JavaImplementation"
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
index 9c42063977..51327ec84e 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
@@ -6,7 +6,7 @@
elementFormDefault="qualified"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">
- <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd04.xsd"/>
<element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/>
<complexType name="SpringImplementation">
<complexContent>
@@ -15,7 +15,6 @@
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="location" type="anyURI" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
</extension>
</complexContent>
</complexType>
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-cd04.xsd
index f2c7d2034f..045118cb43 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-cd04.xsd
@@ -1,41 +1,43 @@
<?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" />
-
- <element name="interface.c" type="sca:CInterface"
- substitutionGroup="sca:interface" />
-
- <complexType name="CInterface">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <element name="function" type="sca:CFunction"
- minOccurs="0" maxOccurs="unbounded" />
- <element name="callbackFunction"
- type="sca:CFunction" minOccurs="0" maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="header" type="string" use="required" />
- <attribute name="callbackHeader" type="string"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="CFunction">
- <attribute name="name" type="NCName" use="required" />
- <attribute name="oneWay" type="boolean" use="optional" />
- <attribute name="input" type="NCName" use="optional" />
- <attribute name="output" type="NCName" use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
-
-</schema>
+<!-- Copyright(C) OASIS(R) 2007,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-cd04.xsd" />
+
+ <element name="interface.c" type="sca:CInterface"
+ substitutionGroup="sca:interface" />
+
+ <complexType name="CInterface">
+ <complexContent>
+ <extension base="sca:Interface">
+ <sequence>
+ <element name="function" type="sca:CFunction"
+ minOccurs="0" maxOccurs="unbounded" />
+ <element name="callbackFunction"
+ type="sca:CFunction" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="header" type="string" use="required" />
+ <attribute name="callbackHeader" type="string"
+ use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="CFunction">
+ <attribute name="name" type="NCName" use="required" />
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional" />
+ <attribute name="oneWay" type="boolean" use="optional" />
+ <attribute name="input" type="NCName" use="optional" />
+ <attribute name="output" type="NCName" use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </complexType>
+
+</schema>
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-cd04.xsd
index c214f7c37b..536b592c04 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-cd04.xsd
@@ -1,42 +1,44 @@
<?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" />
-
- <element name="interface.cpp" type="sca:CPPInterface"
- substitutionGroup="sca:interface" />
-
- <complexType name="CPPInterface">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <element name="function" type="sca:CPPFunction"
- minOccurs="0" maxOccurs="unbounded" />
- <element name="callbackFunction" type="sca:CPPFunction"
- minOccurs="0" maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="header" type="string" use="required" />
- <attribute name="class" type="Name" use="required" />
- <attribute name="callbackHeader" type="string"
- use="optional" />
- <attribute name="callbackClass" type="Name"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="CPPFunction">
- <attribute name="name" type="NCName" use="required" />
- <attribute name="oneWay" type="boolean" use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
-
-</schema>
+<!-- Copyright(C) OASIS(R) 2006,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-cd04.xsd" />
+
+ <element name="interface.cpp" type="sca:CPPInterface"
+ substitutionGroup="sca:interface" />
+
+ <complexType name="CPPInterface">
+ <complexContent>
+ <extension base="sca:Interface">
+ <sequence>
+ <element name="function" type="sca:CPPFunction"
+ minOccurs="0" maxOccurs="unbounded" />
+ <element name="callbackFunction"
+ type="sca:CPPFunction" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="header" type="string" use="required" />
+ <attribute name="class" type="Name" use="required" />
+ <attribute name="callbackHeader" type="string"
+ use="optional" />
+ <attribute name="callbackClass" type="Name"
+ use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="CPPFunction">
+ <attribute name="name" type="NCName" use="required" />
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional" />
+ <attribute name="oneWay" type="boolean" use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
index e5c1ea5448..faf6d1cfb1 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
@@ -6,7 +6,7 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd04.xsd"/>
<!-- Java Interface -->
<element name="interface.java" type="sca:JavaInterface"
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
deleted file mode 100644
index f3abba888e..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.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"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-
- <!-- WSDL 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"/>
- </sequence>
- <attribute name="interface" type="anyURI" use="required"/>
- <attribute name="callbackInterface" type="anyURI"
- use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
index b8b967d890..980e4f90f5 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
@@ -6,7 +6,7 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd04.xsd"/>
<!-- WSDL Interface -->
<element name="interface.wsdl" type="sca:WSDLPortType"
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
index b3de95509e..a6cdfb2be5 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
@@ -1,105 +1,101 @@
-<?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:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- elementFormDefault="qualified">
-
- <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"/>
-
- <element name="intent" type="sca:Intent"/>
- <complexType name="Intent">
- <sequence>
- <element name="description" type="string" minOccurs="0"
- maxOccurs="1" />
- <element name="qualifier" type="sca:IntentQualifier"
- minOccurs="0" maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="constrains" type="sca:listOfQNames"
- use="optional"/>
- <attribute name="requires" type="sca:listOfQNames"
- use="optional"/>
- <attribute name="excludes" type="sca:listOfQNames"
- use="optional"/>
- <attribute name="mutuallyExclusive" type="boolean"
- use="optional" default="false"/>
- <attribute name="intentType"
- type="sca:InteractionOrImplementation"
- use="optional" default="interaction"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="IntentQualifier">
- <sequence>
- <element name="description" type="string" minOccurs="0"
- maxOccurs="1" />
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="default" type="boolean" use="optional"
- default="false"/>
- </complexType>
-
- <element name="policySet" type="sca:PolicySet"/>
- <complexType name="PolicySet">
- <choice minOccurs="0" maxOccurs="unbounded">
- <element name="policySetReference"
- type="sca:PolicySetReference"/>
- <element name="intentMap" type="sca:IntentMap"/>
- <any namespace="##other" processContents="lax"/>
- </choice>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="provides" type="sca:listOfQNames"/>
- <attribute name="appliesTo" type="string" use="required"/>
- <attribute name="attachTo" type="string" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <element name="policySetAttachment"
- type="sca:PolicySetAttachment"/>
- <complexType name="PolicySetAttachment">
- <attribute name="name" type="QName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="PolicySetReference">
- <attribute name="name" type="QName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="IntentMap">
- <choice minOccurs="1" maxOccurs="unbounded">
- <element name="qualifier" type="sca:Qualifier"/>
- <any namespace="##other" processContents="lax"/>
- </choice>
- <attribute name="provides" type="QName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="Qualifier">
- <choice minOccurs="1" maxOccurs="unbounded">
- <element name="intentMap" type="sca:IntentMap"/>
- <any namespace="##other" processContents="lax"/>
- </choice>
- <attribute name="name" type="string" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <simpleType name="listOfNCNames">
- <list itemType="NCName"/>
- </simpleType>
-
- <simpleType name="InteractionOrImplementation">
- <restriction base="string">
- <enumeration value="interaction"/>
- <enumeration value="implementation"/>
- </restriction>
- </simpleType>
-
-</schema>
+<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:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+ <import namespace="http://www.w3.org/ns/ws-policy"
+ schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
+
+ <element name="intent" type="sca:Intent"/>
+ <complexType name="Intent">
+ <sequence>
+ <element name="description" type="string" minOccurs="0"
+ maxOccurs="1" />
+ <element name="qualifier" type="sca:IntentQualifier"
+ minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="name" type="NCName" use="required"/>
+ <attribute name="constrains" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="requires" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="excludes" type="sca:listOfQNames"
+ use="optional"/>
+ <attribute name="mutuallyExclusive" type="boolean"
+ use="optional" default="false"/>
+ <attribute name="intentType"
+ type="sca:InteractionOrImplementation"
+ use="optional" default="interaction"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <complexType name="IntentQualifier">
+ <sequence>
+ <element name="description" type="string" minOccurs="0"
+ maxOccurs="1" />
+ </sequence>
+ <attribute name="name" type="NCName" use="required"/>
+ <attribute name="default" type="boolean" use="optional"
+ default="false"/>
+ </complexType>
+
+ <element name="policySet" type="sca:PolicySet"/>
+ <complexType name="PolicySet">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element name="policySetReference"
+ type="sca:PolicySetReference"/>
+ <element name="intentMap" type="sca:IntentMap"/>
+ <any namespace="##other" processContents="lax"/>
+ </choice>
+ <attribute name="name" type="NCName" use="required"/>
+ <attribute name="provides" type="sca:listOfQNames"/>
+ <attribute name="appliesTo" type="string" use="optional"/>
+ <attribute name="attachTo" type="string" use="optional"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <element name="policySetAttachment"
+ type="sca:PolicySetAttachment"/>
+ <complexType name="PolicySetAttachment">
+ <attribute name="name" type="QName" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <complexType name="PolicySetReference">
+ <attribute name="name" type="QName" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <complexType name="IntentMap">
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <element name="qualifier" type="sca:Qualifier"/>
+ <any namespace="##other" processContents="lax"/>
+ </choice>
+ <attribute name="provides" type="QName" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <complexType name="Qualifier">
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ </sequence>
+ <attribute name="name" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <simpleType name="listOfNCNames">
+ <list itemType="NCName"/>
+ </simpleType>
+
+ <simpleType name="InteractionOrImplementation">
+ <restriction base="string">
+ <enumeration value="interaction"/>
+ <enumeration value="implementation"/>
+ </restriction>
+ </simpleType>
+
+</schema> \ No newline at end of file
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 bb3ad00cd7..de7bc6bdd0 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-1.1-cd03.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.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 32f2a51276..ce8d47b575 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-1.1-cd03.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.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 68dea85a12..92142d117d 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-1.1-cd03.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.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 fadf94fffe..9b15010624 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-1.1-cd03.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
<element name="binding.rmi" type="t:RMIBinding"/>
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 4fd2bd0b06..0e29a09e72 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
@@ -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-1.1-cd03.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
<element name="implementation.osgi" type="t:OSGiImplementation"/>
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 d36fff3ca1..7a8f45954f 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
@@ -23,7 +23,7 @@
<!--
<import namespace="http://www.w3.org/ns/wsdl-instance" schemaLocation="wsdli.xsd"/>
-->
- <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
<include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
<include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 12:03:48 +0000