summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-08-18 09:17:33 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-08-18 09:17:33 +0000
commit21406007c89c7149e0d49b9b9e466d01d69ebd63 (patch)
treeeb628a8a05f660c2f9ce98e155f1132b05b9a751 /sca-java-2.x/trunk/modules
parent62801fec8f2a0d0fabd42992f1798a4d8af347c6 (diff)
Update to latest OASIS schemas
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@986604 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules')
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd38
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd)11
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd)30
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd)33
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd)4
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd)11
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd12
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd)7
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd)2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd)2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd)2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd)24
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd)6
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd)2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd)4
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd)2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd)2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd)2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd05-rev1.xsd51
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd)2
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd)4
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03-rev1.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd)21
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd2
24 files changed, 170 insertions, 106 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index ad8ef70c3c..ba25c9908a 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
@@ -16,4 +16,4 @@
# under the License.
#
tuscany-sca-1.1.xsd
-sca-1.1-cd05.xsd
+sca-1.1-cd05-rev1.xsd
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd
new file mode 100644
index 0000000000..1e38d384ca
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
+
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
+
+ <include schemaLocation="sca-interface-java-1.1-cd04-rev1.xsd"/>
+ <include schemaLocation="sca-interface-wsdl-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-interface-c-1.1-cd05-rev1.xsd"/>
+
+ <include schemaLocation="sca-implementation-java-1.1-cd02-rev1.xsd"/>
+ <include schemaLocation="sca-implementation-composite-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-implementation-cpp-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-implementation-c-1.1-cd05-rev1.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-rev1.xsd"/>
+ <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-binding-jms-1.1-cd04-rev1.xsd"/>
+ <include schemaLocation="sca-binding-jca-1.1-cd04-rev1.xsd"/>
+ <include schemaLocation="sca-binding-sca-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-binding-ejb-1.1-cd02-rev1.xsd"/>
+
+ <include schemaLocation="sca-definitions-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd03-rev1.xsd"/>
+
+ <include schemaLocation="sca-contribution-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-contribution-cpp-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-contribution-c-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-contribution-java-1.1-cd02-rev1.xsd"/>
+
+ <include schemaLocation="sca-jee-1.1-wd03.xsd"/>
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev1.xsd
index 4bccf9d5f8..0ac63d4a86 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev1.xsd
@@ -6,7 +6,7 @@
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<element name="binding.ejb" type="sca:EJBSessionBeanBinding"
substitutionGroup="sca:binding" />
@@ -21,14 +21,13 @@
<complexType name="EJBSessionBeanBinding">
<complexContent>
<extension base="sca:Binding">
- <!-- sequence>
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
- </sequence-->
+ <sequence>
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
+ </sequence>
<attribute name="homeInterface" type="NCName" use="optional"/>
<attribute name="ejb-link-name" type="string" use="optional"/>
<attribute name="ejb-version" type="sca:VersionValue" use="optional" default="EJB3"/>
</extension>
</complexContent>
</complexType>
-</schema>
+</schema> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev1.xsd
index 824ba95b47..789918f41e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev1.xsd
@@ -1,12 +1,11 @@
<?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/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd" />
<complexType name="JCABinding">
<complexContent>
@@ -21,11 +20,9 @@
<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" /-->
+ maxOccurs="unbounded"/>
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1"/>
</sequence>
- <attribute name="connectionInfo" type="anyURI" use="optional" />
<attribute name="initialContextFactory" type="anyURI"
use="optional"/>
<attribute name="jndiURL" type="anyURI" use="optional"/>
@@ -108,7 +105,7 @@
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded" />
</sequence>
- <attribute name="name" type="NMTOKEN" use="optional" />
+ <attribute name="jndiName" type="anyURI" use="optional" />
<attribute name="type" type="NMTOKEN" use="required" />
<attribute name="create" type="sca:JCACreateResource" use="optional"
default="ifNotExist" />
@@ -121,7 +118,7 @@
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded" />
</sequence>
- <attribute name="name" type="NMTOKEN" use="optional" />
+ <attribute name="jndiName" type="anyURI" use="optional" />
<attribute name="type" type="NMTOKEN" use="required" />
<attribute name="create" type="sca:JCACreateResource" use="optional"
default="ifNotExist"/>
@@ -143,7 +140,7 @@
maxOccurs="unbounded" />
</sequence>
<attribute name="name" type="NMTOKEN" use="required" />
- <attribute name="nativeOperation" type="string" use="required" />
+ <attribute name="selectedOperation" type="string" use="required" />
<anyAttribute namespace="##other" processContents="lax" />
</complexType>
<complexType name="ConnectionSpec">
@@ -169,5 +166,4 @@
<element name="binding.jca" type="sca:JCABinding"
substitutionGroup="sca:binding" />
-
-</schema>
+</schema> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev1.xsd
index 50e6aa6201..0fd827dadc 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev1.xsd
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<complexType name="JMSBinding">
<complexContent>
@@ -28,16 +28,12 @@
<element name="operationProperties"
type="sca:JMSOperationProperties"
minOccurs="0" maxOccurs="unbounded"/>
- <!-- any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/ -->
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="correlationScheme" type="QName"
- default="sca:messageId"/>
+ 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>
@@ -55,7 +51,7 @@
<element name="property" type="sca:BindingProperty"
minOccurs="0" maxOccurs="unbounded"/>
</sequence>
- <attribute name="jndiName" type="anyURI" use="required"/>
+ <attribute name="jndiName" type="anyURI"/>
<attribute name="type" use="optional" default="queue">
<simpleType>
<restriction base="string">
@@ -69,11 +65,10 @@
</complexType>
<complexType name="JMSConnectionFactory">
- <sequence>
- <element name="property" type="sca:BindingProperty"
- minOccurs="0" maxOccurs="unbounded"/>
+ <sequence> <element name="property" type="sca:BindingProperty"
+ minOccurs="0" maxOccurs="unbounded"/>
</sequence>
- <attribute name="jndiName" type="anyURI" use="required"/>
+ <attribute name="jndiName" type="anyURI"/>
<attribute name="create" type="sca:JMSCreateResource"
use="optional" default="ifNotExist"/>
</complexType>
@@ -83,14 +78,14 @@
<element name="property" type="sca:BindingProperty"
minOccurs="0" maxOccurs="unbounded"/>
</sequence>
- <attribute name="jndiName" type="anyURI" use="required"/>
+ <attribute name="jndiName" type="anyURI"/>
<attribute name="create" type="sca:JMSCreateResource"
use="optional" default="ifNotExist"/>
</complexType>
<complexType name="JMSResponse">
<sequence>
- <element ref="sca:wireFormat" minOccurs="0" />
+ <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"/>
@@ -105,7 +100,7 @@
minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="type" type="string"/>
- <attribute name="deliveryMode">
+ <attribute name="deliveryMode" default="persistent">
<simpleType>
<restriction base="string">
<enumeration value="persistent"/>
@@ -113,8 +108,8 @@
</restriction>
</simpleType>
</attribute>
- <attribute name="timeToLive" type="long"/>
- <attribute name="priority">
+ <attribute name="timeToLive" type="long" default="0"/>
+ <attribute name="priority" default="4">
<simpleType>
<restriction base="string">
<enumeration value="0"/>
@@ -161,7 +156,7 @@
<complexType name="BindingProperty">
<simpleContent>
<extension base="string">
- <attribute name="name" type="NMTOKEN"/>
+ <attribute name="name" type="NMTOKEN" use="required"/>
<attribute name="type" type="string" use="optional"
default="xs:string"/>
</extension>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05-rev1.xsd
index a337296d45..6cdbf1656e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05-rev1.xsd
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<!-- SCA Binding -->
<element name="binding.sca" type="sca:SCABinding"
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev1.xsd
index 65e200bf8a..9d6d97e32c 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev1.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
@@ -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-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<element name="binding.ws" type="sca:WebServiceBinding"
substitutionGroup="sca:binding"/>
@@ -22,14 +22,13 @@
<complexContent>
<extension base="sca:Binding">
<sequence>
- <element ref="wsa:EndpointReference"
+ <element ref="wsa:EndpointReference"
minOccurs="0" maxOccurs="unbounded"/>
- <!-- any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/-->
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
</sequence>
<attribute name="wsdlElement" type="anyURI" use="optional"/>
<attribute ref="wsdli:wsdlLocation" use="optional"/>
</extension>
</complexContent>
</complexType>
-</schema>
+</schema> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
index 874e36bab8..72d84b31ff 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright OASIS 2005, 2009. All Rights Reserved.
- OASIS trademark, IPR and other policies apply -->
+<!-- (c) Copyright OASIS 2005, 2010. 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/200912"
@@ -9,10 +9,12 @@
<element name="WSCallback">
<complexType>
<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"/>
+ <anyAttribute namespace="##any" processContents="lax"/>
+
</complexType>
</element>
-</schema>
+</schema> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05-rev1.xsd
index da391a983f..346bfe485e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05-rev1.xsd
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<!-- Contribution -->
<element name="contribution" type="sca:ContributionType"/>
@@ -20,8 +20,7 @@
maxOccurs="unbounded"/>
<element ref="sca:exportBase" minOccurs="0"
maxOccurs="unbounded"/>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
</sequence>
</extension>
</complexContent>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd05-rev1.xsd
index a93c4c5960..9e29607c5d 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd05-rev1.xsd
@@ -6,7 +6,7 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-contribution-1.1-cd05.xsd" />
+ <include schemaLocation="sca-contribution-1.1-cd05-rev1.xsd" />
<element name="export.c" type="sca:CExport"
substitutionGroup="sca:exportBase" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd05-rev1.xsd
index 98fffa201f..94813bf6ac 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd05-rev1.xsd
@@ -6,7 +6,7 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-contribution-1.1-cd05.xsd" />
+ <include schemaLocation="sca-contribution-1.1-cd05-rev1.xsd" />
<element name="export.cpp" type="sca:CPPExport"
substitutionGroup="sca:exportBase" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02-rev1.xsd
index 6131804edc..92642591cd 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02-rev1.xsd
@@ -6,7 +6,7 @@
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-contribution-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-contribution-1.1-cd05-rev1.xsd"/>
<!-- Import.java -->
<element name="import.java" type="sca:JavaImportType"
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05-rev1.xsd
index ab0fce9ac8..541a5c324c 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05-rev1.xsd
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd03-rev1.xsd"/>
<import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="http://www.w3.org/2001/xml.xsd"/>
@@ -41,8 +41,7 @@
type="sca:ComponentTypeReference"/>
<element name="property" type="sca:Property"/>
</choice>
- <!-- any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/ -->
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
</sequence>
</extension>
</complexContent>
@@ -215,8 +214,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="type" type="QName" use="required"/>
<attribute name="alwaysProvides" type="sca:listOfQNames"
@@ -230,10 +229,6 @@
<!-- WireFormat Type -->
<element name="wireFormat" type="sca:WireFormatType" abstract="true"/>
<complexType name="WireFormatType" abstract="true">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </sequence>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
@@ -241,10 +236,6 @@
<element name="operationSelector" type="sca:OperationSelectorType"
abstract="true"/>
<complexType name="OperationSelectorType" abstract="true">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
- </sequence>
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
@@ -257,7 +248,7 @@
<element ref="sca:binding"/>
<element ref="sca:requires"/>
<element ref="sca:policySetAttachment"/>
- <!-- any namespace="##other" processContents="lax"/ -->
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
</choice>
<attribute name="requires" type="sca:listOfQNames"
use="optional"/>
@@ -281,8 +272,7 @@
<element ref="sca:requires"/>
<element ref="sca:policySetAttachment"/>
</choice>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
+ <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
</sequence>
<attribute name="name" type="NCName" use="required"/>
<attribute name="autowire" type="boolean" use="optional"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05-rev1.xsd
index 6adbd18148..fcd3cc0f8d 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05-rev1.xsd
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,20010. 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/200912"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
- <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
+ <include schemaLocation="sca-policy-1.1-cd03-rev1.xsd"/>
<!-- Definitions -->
<element name="definitions" type="sca:tDefinitions"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd05-rev1.xsd
index ee4b313e6d..2f394bc260 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd05-rev1.xsd
@@ -7,7 +7,7 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd" />
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd" />
<element name="implementation.c" type="sca:CImplementation"
substitutionGroup="sca:implementation" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05-rev1.xsd
index f2780f9895..5ca0e598de 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05-rev1.xsd
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<!-- Composite Implementation -->
<element name="implementation.composite" type="sca:SCAImplementation"
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd05-rev1.xsd
index b54ced4e4e..93f3c85884 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd05-rev1.xsd
@@ -6,7 +6,7 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd" />
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd" />
<element name="implementation.cpp" type="sca:CPPImplementation"
substitutionGroup="sca:implementation" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02-rev1.xsd
index 2856a51450..90fe13c015 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02-rev1.xsd
@@ -6,7 +6,7 @@
targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<!-- Java Implementation -->
<element name="implementation.java" type="sca:JavaImplementation"
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd05-rev1.xsd
index 518f0747fb..0dca94a6d5 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd05-rev1.xsd
@@ -7,7 +7,7 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd" />
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd" />
<element name="interface.c" type="sca:CInterface"
substitutionGroup="sca:interface" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd05-rev1.xsd
new file mode 100644
index 0000000000..0dee25b649
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd05-rev1.xsd
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Copyright(C) OASIS(R) 2006,2010. 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/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ elementFormDefault="qualified">
+
+ <include schemaLocation="sca-core-1.1-cd05-rev1.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" />
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="CPPFunction">
+ <sequence>
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element ref="sca:requires"/>
+ <element ref="sca:policySetAttachment"/>
+ </choice>
+ <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="oneWay" type="boolean" use="optional" />
+ <attribute name="exclude" type="boolean" use="optional" />
+ <anyAttribute namespace="##other" processContents="lax" />
+ </complexType>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04-rev1.xsd
index 7b78e13749..7dcf79a797 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04-rev1.xsd
@@ -6,7 +6,7 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<!-- Java Interface -->
<element name="interface.java" type="sca:JavaInterface"
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05-rev1.xsd
index 8d3510be7d..532c0a6bd0 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05-rev1.xsd
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/>
<!-- WSDL Interface -->
<element name="interface.wsdl" type="sca:WSDLPortType"
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03-rev1.xsd
index 28652e4ea7..8de738cf73 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03-rev1.xsd
@@ -7,7 +7,7 @@
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
elementFormDefault="qualified">
- <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+ <include schemaLocation="sca-core-1.1-cd06.xsd"/>
<import namespace="http://www.w3.org/ns/ws-policy"
schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
@@ -60,20 +60,15 @@
<element name="externalAttachment">
<complexType>
- <sequence minOccurs="0" maxOccurs="unbounded">
- <any namespace="##other"
- processContents="lax"/>
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
</sequence>
- <attribute name="intents" type="sca:listOfQNames"
- use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames"
- use="optional"/>
- <attribute name="attachTo" type="string"
- use="required"/>
- <anyAttribute namespace="##other"
- processContents="lax"/>
+ <attribute name="intents" type="sca:listOfQNames" use="optional"/>
+ <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+ <attribute name="attachTo" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
</complexType>
- </element>
+ </element>
<element name="policySet" type="sca:PolicySet"/>
<complexType name="PolicySet">
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index 4cf8649bc6..08c6f57eb4 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/sca-java-2.x/trunk/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/200912" schemaLocation="sca-1.1-cd05.xsd"/>
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05-rev1.xsd"/>
<include schemaLocation="tuscany-sca-1.1-binding-atom.xsd"/>