diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-02 02:56:25 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-02 02:56:25 +0000 |
| commit | c28aa6b49186282e660898176e8d279650281b3c (patch) | |
| tree | 35d1966a5a1c7549e5dd7428d75f1fe8d2bca7d7 /sca-cpp/trunk/xsd | |
| parent | aab6c4af74817a50306bdc80bfa9151addec1785 (diff) | |
Upgrade SCDL schemas to cd05 level. Remove unused and unsupported schemas. Add SCDL schema validation test case.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950343 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/xsd')
38 files changed, 323 insertions, 1081 deletions
diff --git a/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd b/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd index 641798b17f..6829a00f4b 100644 --- a/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd +++ b/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd @@ -8,9 +8,9 @@ The limited permissions granted above are perpetual and will not be revoked by O This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. --> <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2"> - <xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/> - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> - <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/> + <xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/> + <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/> <xsd:complexType name="AttributedString"> <xsd:annotation> <xsd:documentation>This type represents an element with arbitrary attributes.</xsd:documentation> diff --git a/sca-cpp/trunk/xsd/external/ws-policy.xsd b/sca-cpp/trunk/xsd/external/ws-policy.xsd index c43e5814ed..71d5da4f5b 100644 --- a/sca-cpp/trunk/xsd/external/ws-policy.xsd +++ b/sca-cpp/trunk/xsd/external/ws-policy.xsd @@ -27,15 +27,15 @@ <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" - schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" /> + schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" /> <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" - schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" /> + schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd" /> <xs:import namespace="http://www.w3.org/XML/1998/namespace" - schemaLocation="http://www.w3.org/2001/xml.xsd" /> + schemaLocation="xml.xsd" /> <!-- Constructs from the Web Services Policy 1.5 Framework --> diff --git a/sca-cpp/trunk/xsd/external/wsdli.xsd b/sca-cpp/trunk/xsd/external/wsdl20-instance.xsd index 24e0b5a975..7fb8c1beed 100644 --- a/sca-cpp/trunk/xsd/external/wsdli.xsd +++ b/sca-cpp/trunk/xsd/external/wsdl20-instance.xsd @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd"> <!-- W3C XML Schema defined in the Web Services Description (WSDL) Version 2.0 specification diff --git a/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd b/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd index 2a767e42ea..c4e9808cfd 100644 --- a/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd +++ b/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE schema - PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd" + PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "XMLSchema.dtd" [ <!ATTLIST schema xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#"> @@ -11,7 +11,7 @@ <!-- Schema for XML Signatures http://www.w3.org/2000/09/xmldsig# - $Revision: 796166 $ on $Date: 2009-07-21 00:03:47 -0700 (Tue, 21 Jul 2009) $ by $Author: reagle $ + $Revision$ on $Date$ by $Author: reagle $ Copyright 2001 The Internet Society and W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en diff --git a/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd deleted file mode 100644 index 224c1254b3..0000000000 --- a/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd +++ /dev/null @@ -1,39 +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/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"> - - <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-binding-ejb-1.1-cd01.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"/> - - <include schemaLocation="sca-jee-1.1-wd03.xsd"/> - -</schema> diff --git a/sca-cpp/trunk/xsd/sca-1.1-cd05.xsd b/sca-cpp/trunk/xsd/sca-1.1-cd05.xsd new file mode 100644 index 0000000000..51cc513276 --- /dev/null +++ b/sca-cpp/trunk/xsd/sca-1.1-cd05.xsd @@ -0,0 +1,24 @@ +<?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.xsd"/> + + <include schemaLocation="sca-interface-java-1.1-cd04.xsd"/> + <include schemaLocation="sca-interface-wsdl-1.1-cd05.xsd"/> + <include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/> + + <include schemaLocation="sca-implementation-java-1.1-cd02.xsd"/> + <include schemaLocation="sca-implementation-composite-1.1-cd05.xsd"/> + <include schemaLocation="sca-implementation-cpp-1.1-cd04.xsd"/> + + <include schemaLocation="sca-binding-ws-1.1-cd04.xsd"/> + <include schemaLocation="sca-binding-sca-1.1-cd05.xsd"/> + + <include schemaLocation="sca-definitions-1.1-cd05.xsd"/> + <include schemaLocation="sca-policy-1.1-cd03.xsd"/> + +</schema> diff --git a/sca-cpp/trunk/xsd/sca-binding-ejb-1.1-cd01.xsd b/sca-cpp/trunk/xsd/sca-binding-ejb-1.1-cd01.xsd deleted file mode 100644 index b8556f3632..0000000000 --- a/sca-cpp/trunk/xsd/sca-binding-ejb-1.1-cd01.xsd +++ /dev/null @@ -1,34 +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/200912" - targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" - elementFormDefault="qualified"> - - <include schemaLocation="sca-core-1.1-cd04.xsd" /> - - <element name="binding.ejb" type="sca:EJBSessionBeanBinding" - substitutionGroup="sca:binding" /> - - <simpleType name="VersionValue"> - <restriction base="string"> - <enumeration value="EJB2" /> - <enumeration value="EJB3" /> - </restriction> - </simpleType> - - <complexType name="EJBSessionBeanBinding"> - <complexContent> - <extension base="sca:Binding"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </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>
\ No newline at end of file diff --git a/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd deleted file mode 100644 index 5fd3f9d687..0000000000 --- a/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd +++ /dev/null @@ -1,173 +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/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - 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/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd deleted file mode 100644 index e1838dddf0..0000000000 --- a/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd +++ /dev/null @@ -1,183 +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/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - 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> - - <!-- TUSCANY-3297 --> - <any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded"/> - - </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/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd05.xsd index d607d8730f..a337296d45 100644 --- a/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd05.xsd @@ -6,7 +6,7 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> <!-- SCA Binding --> <element name="binding.sca" type="sca:SCABinding" diff --git a/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd index 8e5a72b493..cf71892578 100644 --- a/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd @@ -9,11 +9,11 @@ elementFormDefault="qualified"> <import namespace="http://www.w3.org/ns/wsdl-instance" - schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/> + schemaLocation="external/wsdl20-instance.xsd"/> <import namespace="http://www.w3.org/2005/08/addressing" - schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/> + schemaLocation="external/ws-addr.xsd"/> - <include schemaLocation="sca-core-1.1-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> <element name="binding.ws" type="sca:WebServiceBinding" substitutionGroup="sca:binding"/> @@ -22,10 +22,10 @@ <complexContent> <extension base="sca:Binding"> <sequence> - <element name="endpointReference" type="wsa:EndpointReferenceType" + <element ref="wsa:EndpointReference" minOccurs="0" maxOccurs="unbounded"/> - <any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded"/> + <!-- any namespace="##other" processContents="lax" + minOccurs="0" maxOccurs="unbounded"/--> </sequence> <attribute name="wsdlElement" type="anyURI" use="optional"/> <attribute ref="wsdli:wsdlLocation" use="optional"/> diff --git a/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd deleted file mode 100644 index 874e36bab8..0000000000 --- a/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- (c) Copyright OASIS 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" - elementFormDefault="qualified"> - - <element name="WSCallback"> - <complexType> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> - </element> - -</schema> diff --git a/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd deleted file mode 100644 index f17675a8b1..0000000000 --- a/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd +++ /dev/null @@ -1,90 +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/200912" - targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" - elementFormDefault="qualified"> - - <include schemaLocation="sca-core-1.1-cd04.xsd"/> - - <!-- Contribution --> - <element name="contribution" type="sca:ContributionType"/> - <complexType name="ContributionType"> - <complexContent> - <extension base="sca:CommonExtensionBase"> - <sequence> - <element name="deployable" type="sca:DeployableType" - minOccurs="0" maxOccurs="unbounded"/> - <element ref="sca:importBase" minOccurs="0" - maxOccurs="unbounded"/> - <element ref="sca:exportBase" minOccurs="0" - maxOccurs="unbounded"/> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <!-- Deployable --> - <complexType name="DeployableType"> - <complexContent> - <extension base="sca:CommonExtensionBase"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - <attribute name="composite" type="QName" use="required"/> - </extension> - </complexContent> - </complexType> - - <!-- Import --> - <element name="importBase" type="sca:Import" abstract="true" /> - <complexType name="Import" abstract="true"> - <complexContent> - <extension base="sca:CommonExtensionBase"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name="import" type="sca:ImportType" - substitutionGroup="sca:importBase"/> - <complexType name="ImportType"> - <complexContent> - <extension base="sca:Import"> - <attribute name="namespace" type="string" use="required"/> - <attribute name="location" type="anyURI" use="optional"/> - </extension> - </complexContent> - </complexType> - - <!-- Export --> - <element name="exportBase" type="sca:Export" abstract="true" /> - <complexType name="Export" abstract="true"> - <complexContent> - <extension base="sca:CommonExtensionBase"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name="export" type="sca:ExportType" - substitutionGroup="sca:exportBase"/> - <complexType name="ExportType"> - <complexContent> - <extension base="sca:Export"> - <attribute name="namespace" type="string" use="required"/> - </extension> - </complexContent> - </complexType> - -</schema> diff --git a/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd deleted file mode 100644 index f765eaae85..0000000000 --- a/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd +++ /dev/null @@ -1,35 +0,0 @@ -<?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/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - 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/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd deleted file mode 100644 index f98c6dc040..0000000000 --- a/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd +++ /dev/null @@ -1,35 +0,0 @@ -<?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/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - 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/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd b/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd deleted file mode 100644 index 7bad3bfc2a..0000000000 --- a/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd +++ /dev/null @@ -1,33 +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/200912" - targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" - elementFormDefault="qualified"> - - <include schemaLocation="sca-contribution-1.1-cd04.xsd"/> - - <!-- Import.java --> - <element name="import.java" type="sca:JavaImportType" - substitutionGroup="sca:importBase" /> - <complexType name="JavaImportType"> - <complexContent> - <extension base="sca:Import"> - <attribute name="package" type="string" use="required"/> - <attribute name="location" type="anyURI" use="optional"/> - </extension> - </complexContent> - </complexType> - - <!-- Export.java --> - <element name="export.java" type="sca:JavaExportType" - substitutionGroup="sca:exportBase" /> - <complexType name="JavaExportType"> - <complexContent> - <extension base="sca:Export"> - <attribute name="package" type="string" use="required"/> - </extension> - </complexContent> - </complexType> - -</schema> diff --git a/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-core-1.1-cd05.xsd index 158daff214..466a1466e7 100644 --- a/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-core-1.1-cd05.xsd @@ -6,8 +6,9 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> + <include schemaLocation="sca-policy-1.1-cd03.xsd"/> <import namespace="http://www.w3.org/XML/1998/namespace" - schemaLocation="http://www.w3.org/2001/xml.xsd"/> + schemaLocation="external/xml.xsd"/> <!-- Common extension base for SCA definitions --> <complexType name="CommonExtensionBase"> @@ -33,20 +34,16 @@ <complexContent> <extension base="sca:CommonExtensionBase"> <sequence> - <!-- Comment out the sca:implementation to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. --> - <!-- <element ref="sca:implementation" minOccurs="0"/> - --> <choice minOccurs="0" maxOccurs="unbounded"> <element name="service" type="sca:ComponentService"/> <element name="reference" type="sca:ComponentTypeReference"/> <element name="property" type="sca:Property"/> </choice> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> + <!-- any namespace="##other" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/ --> </sequence> - <attribute name="constrainingType" type="QName" use="optional"/> </extension> </complexContent> </complexType> @@ -60,6 +57,8 @@ <element ref="sca:include" minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"> + <element ref="sca:requires"/> + <element ref="sca:policySetAttachment"/> <element name="service" type="sca:Service"/> <element name="property" type="sca:Property"/> <element name="component" type="sca:Component"/> @@ -75,7 +74,6 @@ default="false"/> <attribute name="autowire" type="boolean" use="optional" default="false"/> - <attribute name="constrainingType" type="QName" use="optional"/> <attribute name="requires" type="sca:listOfQNames" use="optional"/> <attribute name="policySets" type="sca:listOfQNames" @@ -93,8 +91,11 @@ <element ref="sca:binding" minOccurs="0" maxOccurs="unbounded" /> <element ref="sca:callback" minOccurs="0" maxOccurs="1" /> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> + <element ref="sca:requires" minOccurs="0" + maxOccurs="unbounded"/> + <element ref="sca:policySetAttachment" minOccurs="0" + maxOccurs="unbounded"/> + <element ref="sca:extensions" minOccurs="0" maxOccurs="1" /> </sequence> <attribute name="name" type="NCName" use="required" /> <attribute name="requires" type="sca:listOfQNames" @@ -119,6 +120,10 @@ <complexType name="Interface" abstract="true"> <complexContent> <extension base="sca:CommonExtensionBase"> + <choice minOccurs="0" maxOccurs="unbounded"> + <element ref="sca:requires"/> + <element ref="sca:policySetAttachment"/> + </choice> <attribute name="remotable" type="boolean" use="optional"/> <attribute name="requires" type="sca:listOfQNames" use="optional"/> @@ -132,13 +137,12 @@ <complexType name="Reference"> <complexContent> <extension base="sca:Contract"> - <attribute name="autowire" type="boolean" use="optional"/> <attribute name="target" type="sca:listOfAnyURIs" use="optional"/> <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/> <attribute name="multiplicity" type="sca:Multiplicity" - use="optional" default="1..1"/> + use="required"/> <attribute name="promote" type="sca:listOfAnyURIs" use="required"/> </extension> @@ -155,58 +159,29 @@ i.e. no element-based extension point under "sca:property" --> </sequence> <!-- mixed="true" to handle simple type --> - <attribute name="requires" type="sca:listOfQNames" use="optional"/> - <attribute name="policySets" type="sca:listOfQNames" use="optional"/> + <attribute name="name" type="NCName" use="required"/> + <attribute name="type" type="QName" use="optional"/> + <attribute name="element" type="QName" use="optional"/> + <attribute name="many" type="boolean" use="optional" default="false"/> + <attribute name="value" type="anySimpleType" use="optional"/> + <anyAttribute namespace="##other" processContents="lax"/> </complexType> <complexType name="Property" mixed="true"> <complexContent mixed="true"> <extension base="sca:SCAPropertyBase"> - <attribute name="name" type="NCName" use="required"/> - <attribute name="type" type="QName" use="optional"/> - <attribute name="element" type="QName" use="optional"/> - <attribute name="many" type="boolean" use="optional" - default="false"/> <attribute name="mustSupply" type="boolean" use="optional" default="false"/> - <anyAttribute namespace="##other" processContents="lax"/> </extension> - <!-- extension defines the place to hold default value --> - <!-- an extension point ; attribute-based only --> - </complexContent> - </complexType> - - <!-- ConstrainingProperty is equivalent to the Property type but removes - the capability to contain a value --> - <complexType name="ConstrainingProperty" mixed="true"> - <complexContent mixed="true"> - <restriction base="sca:Property"> - <attribute name="name" type="NCName" use="required"/> - <attribute name="type" type="QName" use="optional"/> - <attribute name="element" type="QName" use="optional"/> - <attribute name="many" type="boolean" use="optional" - default="false"/> - <attribute name="mustSupply" type="boolean" use="optional" - default="false"/> - <anyAttribute namespace="##other" processContents="lax"/> - </restriction> </complexContent> </complexType> <complexType name="PropertyValue" mixed="true"> <complexContent mixed="true"> <extension base="sca:SCAPropertyBase"> - <attribute name="name" type="NCName" use="required"/> - <attribute name="type" type="QName" use="optional"/> - <attribute name="element" type="QName" use="optional"/> - <attribute name="many" type="boolean" use="optional" - default="false"/> <attribute name="source" type="string" use="optional"/> <attribute name="file" type="anyURI" use="optional"/> - <attribute name="value" type="string" use="optional"/> - <anyAttribute namespace="##other" processContents="lax"/> </extension> - <!-- an extension point ; attribute-based only --> </complexContent> </complexType> @@ -219,6 +194,10 @@ <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" /> <element ref="sca:operationSelector" minOccurs="0" maxOccurs="1" /> + <element ref="sca:requires" minOccurs="0" + maxOccurs="unbounded"/> + <element ref="sca:policySetAttachment" minOccurs="0" + maxOccurs="unbounded"/> </sequence> <attribute name="uri" type="anyURI" use="optional"/> <attribute name="name" type="NCName" use="optional"/> @@ -236,8 +215,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" @@ -259,7 +238,8 @@ </complexType> <!-- OperationSelector Type --> - <element name="operationSelector" type="sca:OperationSelectorType" abstract="true"/> + <element name="operationSelector" type="sca:OperationSelectorType" + abstract="true"/> <complexType name="OperationSelectorType" abstract="true"> <sequence> <any namespace="##other" processContents="lax" minOccurs="0" @@ -275,7 +255,9 @@ <extension base="sca:CommonExtensionBase"> <choice minOccurs="0" maxOccurs="unbounded"> <element ref="sca:binding"/> - <any namespace="##other" processContents="lax"/> + <element ref="sca:requires"/> + <element ref="sca:policySetAttachment"/> + <!-- any namespace="##other" processContents="lax"/ --> </choice> <attribute name="requires" type="sca:listOfQNames" use="optional"/> @@ -290,19 +272,20 @@ <complexContent> <extension base="sca:CommonExtensionBase"> <sequence> - <!-- Set minOccurs="1" instead of "0" to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. --> - <element ref="sca:implementation" minOccurs="1"/> + <element ref="sca:implementation" minOccurs="1" + maxOccurs="1"/> <choice minOccurs="0" maxOccurs="unbounded"> <element name="service" type="sca:ComponentService"/> <element name="reference" type="sca:ComponentReference"/> <element name="property" type="sca:PropertyValue"/> + <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="autowire" type="boolean" use="optional"/> - <attribute name="constrainingType" type="QName" use="optional"/> <attribute name="requires" type="sca:listOfQNames" use="optional"/> <attribute name="policySets" type="sca:listOfQNames" @@ -319,22 +302,6 @@ </complexContent> </complexType> - <!-- Constraining Service --> - <complexType name="ConstrainingService"> - <complexContent> - <restriction base="sca:ComponentService"> - <sequence> - <element ref="sca:interface" minOccurs="0" maxOccurs="1" /> - <element ref="sca:callback" minOccurs="0" maxOccurs="1" /> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </sequence> - <attribute name="name" type="NCName" use="required" /> - </restriction> - </complexContent> - </complexType> - - <!-- Component Reference --> <complexType name="ComponentReference"> <complexContent> @@ -352,26 +319,6 @@ </complexContent> </complexType> - <!-- Constraining Reference --> - <complexType name="ConstrainingReference"> - <complexContent> - <restriction base="sca:ComponentReference"> - <sequence> - <element ref="sca:interface" minOccurs="0" maxOccurs="1" /> - <element ref="sca:callback" minOccurs="0" maxOccurs="1" /> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </sequence> - <attribute name="name" type="NCName" use="required" /> - <attribute name="autowire" type="boolean" use="optional"/> - <attribute name="wiredByImpl" type="boolean" use="optional" - default="false"/> - <attribute name="multiplicity" type="sca:Multiplicity" - use="optional" default="1..1"/> - </restriction> - </complexContent> - </complexType> - <!-- Component Type Reference --> <complexType name="ComponentTypeReference"> <complexContent> @@ -383,8 +330,11 @@ <element ref="sca:binding" minOccurs="0" maxOccurs="unbounded"/> <element ref="sca:callback" minOccurs="0"/> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> + <element ref="sca:requires" minOccurs="0" + maxOccurs="unbounded"/> + <element ref="sca:policySetAttachment" 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"/> @@ -407,6 +357,10 @@ <complexType name="Implementation" abstract="true"> <complexContent> <extension base="sca:CommonExtensionBase"> + <choice minOccurs="0" maxOccurs="unbounded"> + <element ref="sca:requires"/> + <element ref="sca:policySetAttachment"/> + </choice> <attribute name="requires" type="sca:listOfQNames" use="optional"/> <attribute name="policySets" type="sca:listOfQNames" @@ -458,27 +412,16 @@ </extension> </complexContent> </complexType> - - <!-- Constraining Type --> - <element name="constrainingType" type="sca:ConstrainingType"/> - <complexType name="ConstrainingType"> - <complexContent> - <extension base="sca:CommonExtensionBase"> - <sequence> - <choice minOccurs="0" maxOccurs="unbounded"> - <element name="service" type="sca:ConstrainingService"/> - <element name="reference" - type="sca:ConstrainingReference"/> - <element name="property" type="sca:ConstrainingProperty"/> - </choice> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - <attribute name="name" type="NCName" use="required"/> - <attribute name="targetNamespace" type="anyURI"/> - </extension> - </complexContent> - </complexType> + + <!-- Extensions element --> + <element name="extensions"> + <complexType> + <sequence> + <any namespace="##other" processContents="lax" + minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> <!-- Intents within WSDL documents --> <attribute name="requires" type="sca:listOfQNames"/> @@ -492,7 +435,8 @@ <element name="value" type="sca:ValueType"/> <complexType name="ValueType" mixed="true"> <sequence> - <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs='unbounded'/> + <any namespace="##any" processContents="lax" minOccurs="0" + maxOccurs='unbounded'/> </sequence> <!-- mixed="true" to handle simple type --> <anyAttribute namespace="##any" processContents="lax"/> @@ -524,11 +468,11 @@ <list itemType="anyURI"/> </simpleType> - <simpleType name="CreateResource"> - <restriction base="string"> - <enumeration value="always" /> - <enumeration value="never" /> - <enumeration value="ifnotexist" /> - </restriction> - </simpleType> + <simpleType name="CreateResource"> + <restriction base="string"> + <enumeration value="always" /> + <enumeration value="never" /> + <enumeration value="ifnotexist" /> + </restriction> + </simpleType> </schema> diff --git a/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-definitions-1.1-cd05.xsd index ef22e1dd3e..8f2f20db19 100644 --- a/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-definitions-1.1-cd05.xsd @@ -6,8 +6,8 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd04.xsd"/> - <include schemaLocation="sca-policy-1.1-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> + <include schemaLocation="sca-policy-1.1-cd03.xsd"/> <!-- Definitions --> <element name="definitions" type="sca:tDefinitions"/> @@ -17,7 +17,6 @@ <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" diff --git a/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd b/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd deleted file mode 100644 index 0d5b747253..0000000000 --- a/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd +++ /dev/null @@ -1,32 +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/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- 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-cd04.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="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
-
diff --git a/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd deleted file mode 100644 index e408f727f8..0000000000 --- a/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd +++ /dev/null @@ -1,57 +0,0 @@ -<?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/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - 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/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd05.xsd index c0517b0a32..f2780f9895 100644 --- a/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd05.xsd @@ -6,7 +6,7 @@ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> <!-- Composite Implementation --> <element name="implementation.composite" type="sca:SCAImplementation" diff --git a/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd index b71eda300d..b54ced4e4e 100644 --- a/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. +<!-- 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-cd04.xsd" /> + <include schemaLocation="sca-core-1.1-cd05.xsd" /> <element name="implementation.cpp" type="sca:CPPImplementation" substitutionGroup="sca:implementation" /> @@ -32,7 +32,6 @@ use="optional" /> <attribute name="allowsPassByReference" type="boolean" use="optional" /> - <anyAttribute namespace="##other" processContents="lax" /> </extension> </complexContent> </complexType> @@ -45,7 +44,17 @@ </simpleType> <complexType name="CPPImplementationFunction"> + <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="allowsPassByReference" type="boolean" use="optional" /> <anyAttribute namespace="##other" processContents="lax" /> diff --git a/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd b/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd02.xsd index aac845ff59..2856a51450 100644 --- a/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd +++ b/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd02.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-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> <!-- Java Implementation --> <element name="implementation.java" type="sca:JavaImplementation" @@ -19,9 +19,8 @@ maxOccurs="unbounded"/> </sequence> <attribute name="class" type="NCName" use="required"/> - <anyAttribute namespace="##other" processContents="lax"/> </extension> </complexContent> </complexType> -</schema> +</schema>
\ No newline at end of file diff --git a/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd b/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd deleted file mode 100644 index cce7738dff..0000000000 --- a/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd +++ /dev/null @@ -1,21 +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/200912" - elementFormDefault="qualified" - targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"> - - <include schemaLocation="sca-core-1.1-cd04.xsd"/> - <element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/> - <complexType name="SpringImplementation"> - <complexContent> - <extension base="sca:Implementation"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="location" type="anyURI" use="required"/> - </extension> - </complexContent> - </complexType> -</schema> diff --git a/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd deleted file mode 100644 index d5bff5d542..0000000000 --- a/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd +++ /dev/null @@ -1,43 +0,0 @@ -<?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/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - 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/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd index e3e3c9369e..b07bf01f1d 100644 --- a/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd @@ -1,12 +1,13 @@ <?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/200912" + <!-- + 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-cd04.xsd" /> + <include schemaLocation="sca-core-1.1-cd05.xsd" /> <element name="interface.cpp" type="sca:CPPInterface" substitutionGroup="sca:interface" /> @@ -15,29 +16,35 @@ <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" + <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" /> + <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="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> diff --git a/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd index 7d3a536b8c..7b78e13749 100644 --- a/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.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-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> <!-- Java Interface --> <element name="interface.java" type="sca:JavaInterface" @@ -21,7 +21,6 @@ <attribute name="interface" type="NCName" use="required"/> <attribute name="callbackInterface" type="NCName" use="optional"/> - <anyAttribute namespace="##other" processContents="lax"/> </extension> </complexContent> </complexType> diff --git a/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd05.xsd index 3f0be7dc6d..8d3510be7d 100644 --- a/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd05.xsd @@ -6,7 +6,7 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> <!-- WSDL Interface --> <element name="interface.wsdl" type="sca:WSDLPortType" @@ -21,7 +21,6 @@ <attribute name="interface" type="anyURI" use="required"/> <attribute name="callbackInterface" type="anyURI" use="optional"/> - <anyAttribute namespace="##other" processContents="lax"/> </extension> </complexContent> </complexType> diff --git a/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd b/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd deleted file mode 100644 index 18daa8c926..0000000000 --- a/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd +++ /dev/null @@ -1,52 +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/200912"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
- <element name="implementation.ejb" type="sca:EJBImplementation"
- substitutionGroup="sca:implementation"/>
- <complexType name="EJBImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <attribute name="ejb-link" type="string" use="required"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
- <element name="implementation.web" type="sca:WebImplementation"
- substitutionGroup="sca:implementation"/>
- <complexType name="WebImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <attribute name="web-uri" type="string" use="required"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
- <element name="implementation.jee" type="sca:JEEImplementation"
- substitutionGroup="sca:implementation"/>
- <complexType name="JEEImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <attribute name="archive" type="string" use="required"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-</schema>
diff --git a/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-policy-1.1-cd03.xsd index 372e8c24b3..81d7eb346c 100644 --- a/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd +++ b/sca-cpp/trunk/xsd/sca-policy-1.1-cd03.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" @@ -7,9 +7,9 @@ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> <import namespace="http://www.w3.org/ns/ws-policy" - schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/> + schemaLocation="external/ws-policy.xsd"/> <element name="intent" type="sca:Intent"/> <complexType name="Intent"> @@ -40,12 +40,24 @@ <sequence> <element name="description" type="string" minOccurs="0" maxOccurs="1" /> + <any namespace="##other" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/> </sequence> <attribute name="name" type="NCName" use="required"/> <attribute name="default" type="boolean" use="optional" default="false"/> </complexType> + <element name="requires"> + <complexType> + <sequence minOccurs="0" maxOccurs="unbounded"> + <any namespace="##other" processContents="lax"/> + </sequence> + <attribute name="intents" type="sca:listOfQNames" use="required"/> + <anyAttribute namespace="##other" processContents="lax"/> + </complexType> + </element> + <element name="policySet" type="sca:PolicySet"/> <complexType name="PolicySet"> <choice minOccurs="0" maxOccurs="unbounded"> @@ -61,12 +73,15 @@ <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> + <element name="policySetAttachment"> + <complexType> + <sequence minOccurs="0" maxOccurs="unbounded"> + <any namespace="##other" processContents="lax"/> + </sequence> + <attribute name="name" type="QName" use="required"/> + <anyAttribute namespace="##other" processContents="lax"/> + </complexType> + </element> <complexType name="PolicySetReference"> <attribute name="name" type="QName" use="required"/> @@ -101,4 +116,4 @@ </restriction> </simpleType> -</schema>
\ No newline at end of file +</schema> diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-atom.xsd index a3477c4a34..603455a1f2 100644 --- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd +++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-atom.xsd @@ -23,18 +23,21 @@ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="binding.rmi" type="t:RMIBinding"/> + <element name="binding.atom" type="t:AtomBinding" substitutionGroup="sca:binding"/> - <complexType name="RMIBinding"> + <complexType name="AtomBinding"> <complexContent> <extension base="sca:Binding"> - <sequence> + <!-- sequence> <any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </sequence> + </sequence --> + <attribute name="title" type="string" use="optional"/> + <attribute name="description" type="string" use="optional"/> + <!-- anyAttribute namespace="##any" processContents="lax"/ --> </extension> </complexContent> </complexType> -</schema> +</schema>
\ No newline at end of file diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd index ff0ecd1414..67feb54963 100644 --- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd +++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd @@ -23,18 +23,18 @@ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="binding.http" type="t:HTTPBinding"/> + <element name="binding.http" type="t:HTTPBinding" substitutionGroup="sca:binding"/> <complexType name="HTTPBinding"> <complexContent> <extension base="sca:Binding"> <sequence> - <any namespace="##targetNamespace" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> + <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/ --> </sequence> - <anyAttribute namespace="##any" processContents="lax"/> + <!-- anyAttribute namespace="##any" processContents="lax"/--> </extension> </complexContent> </complexType> diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd index 2fb4587862..d1bdcbdfae 100644 --- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd +++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd @@ -23,18 +23,18 @@ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="binding.jsonrpc" type="t:JSONRPCBinding"/> + <element name="binding.jsonrpc" type="t:JSONRPCBinding" substitutionGroup="sca:binding"/> <complexType name="JSONRPCBinding"> <complexContent> <extension base="sca:Binding"> <sequence> - <any namespace="##targetNamespace" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> + <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/ --> </sequence> - <anyAttribute namespace="##any" processContents="lax"/> + <!-- anyAttribute namespace="##any" processContents="lax"/ --> </extension> </complexContent> </complexType> diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rest.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rest.xsd new file mode 100644 index 0000000000..f19a0c4248 --- /dev/null +++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rest.xsd @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<schema xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" + elementFormDefault="qualified"> + + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> + + <element name="binding.rest" type="t:RESTBinding" substitutionGroup="sca:binding"/> + + + <complexType name="RESTBinding"> + <complexContent> + <extension base="sca:Binding"> + <sequence> + <element ref="t:http-headers" minOccurs="0" maxOccurs="1"/> + <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/ --> + </sequence> + <!-- anyAttribute namespace="##any" processContents="lax"/--> + </extension> + </complexContent> + </complexType> + + <complexType name="HTTPHeadersType"> + <sequence> + <element ref="t:header" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <element name="http-headers" type="t:HTTPHeadersType"/> + + <complexType name="HTTPHeaderType"> + <attribute name="name" type="string" use="required" /> + <attribute name="value" type="string" use="required" /> + </complexType> + + <element name="header" type="t:HTTPHeaderType" /> + + <!-- wire formats --> + <complexType name="WireFormatJSONType"> + <complexContent> + <extension base="sca:WireFormatType"/> + </complexContent> + </complexType> + + <element name="wireFormat.json" type="t:WireFormatJSONType" + substitutionGroup="sca:wireFormat"/> + + <complexType name="WireFormatXMLType"> + <complexContent> + <extension base="sca:WireFormatType"/> + </complexContent> + </complexType> + + <element name="wireFormat.xml" type="t:WireFormatXMLType" + substitutionGroup="sca:wireFormat"/> + + <!-- operation selectors --> + <complexType name="OperationSelectorJAXRSType"> + <complexContent> + <extension base="sca:OperationSelectorType"/> + </complexContent> + </complexType> + <element name="operationSelector.jaxrs" + type="t:OperationSelectorJAXRSType" + substitutionGroup="sca:operationSelector"/> + + <complexType name="OperationSelectorRPCType"> + <complexContent> + <extension base="sca:OperationSelectorType"/> + </complexContent> + </complexType> + <element name="operationSelector.rpc" + type="t:OperationSelectorRPCType" + substitutionGroup="sca:operationSelector"/> + +</schema> diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rss.xsd index a41087d6ec..9857ec62b7 100644 --- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd +++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rss.xsd @@ -23,19 +23,21 @@ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="binding.dwr" type="t:DWRBinding"/> + <element name="binding.rss" type="t:RSSBinding" substitutionGroup="sca:binding"/> - <complexType name="DWRBinding"> + <complexType name="RSSBinding"> <complexContent> <extension base="sca:Binding"> - <sequence> + <!--sequence> <any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <anyAttribute namespace="##any" processContents="lax"/> + </sequence --> + <attribute name="title" type="string" use="optional"/> + <attribute name="description" type="string" use="optional"/> + <!--anyAttribute namespace="##any" processContents="lax"/--> </extension> </complexContent> </complexType> -</schema> +</schema>
\ No newline at end of file diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-python.xsd index 21d6fa377d..182111daa6 100644 --- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd +++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-python.xsd @@ -17,26 +17,27 @@ * specific language governing permissions and limitations * under the License. --> -<schema xmlns="http://www.w3.org/2001/XMLSchema" +<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="implementation.widget" type="t:WidgetImplementation" substitutionGroup="sca:implementation"/> + <element name="implementation.python" type="t:PythonImplementation" substitutionGroup="sca:implementation"/> - <complexType name="WidgetImplementation"> + <complexType name="PythonImplementation"> <complexContent> <extension base="sca:Implementation"> <sequence> <any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> - <attribute name="location" type="anyURI" use="required"/> + <attribute name="script" type="anyURI" use="required"/> <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> + </schema> diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-scheme.xsd index ab445dfe9e..9282918612 100644 --- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd +++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-scheme.xsd @@ -7,15 +7,15 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. --> <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" @@ -23,31 +23,21 @@ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="implementation.osgi" type="t:OSGiImplementation" substitutionGroup="sca:implementation"/> - - <complexType name="OSGiImplementation"> + <element name="implementation.scheme" type="t:SchemeImplementation" substitutionGroup="sca:implementation"/> + + <complexType name="SchemeImplementation"> <complexContent> <extension base="sca:Implementation"> <sequence> - <any namespace="##targetNamespace" processContents="lax" + <any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> - <attribute name="bundleSymbolicName" type="string" use="required"/> - <attribute name="bundleVersion" type="string" use="optional"/> + <attribute name="script" type="anyURI" use="required"/> <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> - <element name="osgi.property" type="t:OSGiProperty"/> - <complexType name="OSGiProperty"> - <simpleContent> - <extension base="string"> - <attribute name="name" type="NCName" use="required"/> - <attribute name="value" type="string" use="optional"/> - </extension> - </simpleContent> - </complexType> </schema> diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd index 4a1a1e000d..089da7e5fe 100644 --- a/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd +++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd @@ -20,16 +20,15 @@ <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"> -<!-- - <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-cd04.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> + - <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/> + <include schemaLocation="tuscany-sca-1.1-binding-atom.xsd"/> <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/> <include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/> - <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/> + <include schemaLocation="tuscany-sca-1.1-binding-rest.xsd"/> + <include schemaLocation="tuscany-sca-1.1-binding-rss.xsd"/> - <include schemaLocation="tuscany-sca-1.1-implementation-osgi.xsd"/> - <include schemaLocation="tuscany-sca-1.1-implementation-widget.xsd"/> -</schema>
\ No newline at end of file + <include schemaLocation="tuscany-sca-1.1-implementation-python.xsd"/> + <include schemaLocation="tuscany-sca-1.1-implementation-scheme.xsd"/> +</schema> |