You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/08/22 02:29:38 UTC
svn commit: r433441 - in /incubator/tuscany/cpp/sca/xsd: sca-core.xsd sca.xsd
Author: jsdelfino
Date: Mon Aug 21 17:29:37 2006
New Revision: 433441
URL: http://svn.apache.org/viewvc?rev=433441&view=rev
Log:
Minimizing differences with the spec XSD, and merged composite back into the core xsd
Modified:
incubator/tuscany/cpp/sca/xsd/sca-core.xsd
incubator/tuscany/cpp/sca/xsd/sca.xsd
Modified: incubator/tuscany/cpp/sca/xsd/sca-core.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/xsd/sca-core.xsd?rev=433441&r1=433440&r2=433441&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/xsd/sca-core.xsd (original)
+++ incubator/tuscany/cpp/sca/xsd/sca-core.xsd Mon Aug 21 17:29:37 2006
@@ -30,12 +30,53 @@
<anyAttribute namespace="##any" processContents="lax" />
</complexType>
+ <element name="composite" type="sca:Composite" />
+ <complexType name="Composite">
+ <sequence>
+ <element minOccurs="0" maxOccurs="unbounded" name="include" type="anyURI" />
+ <element minOccurs="0" maxOccurs="unbounded" name="service" type="sca:CompositeServiceType" />
+ <element minOccurs="0" maxOccurs="unbounded" name="property" type="sca:PropertyType" />
+ <element minOccurs="0" maxOccurs="unbounded" name="component" type="sca:Component" />
+ <element minOccurs="0" maxOccurs="unbounded" name="reference" type="sca:CompositeReferenceType" />
+ <element minOccurs="0" maxOccurs="unbounded" name="wire" type="sca:Wire" />
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="name" type="NCName" use="required" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+
+ <complexType name="CompositeServiceType">
+ <sequence>
+ <element ref="sca:interface" minOccurs="1" maxOccurs="1" />
+ <element ref="sca:binding" minOccurs="0" maxOccurs="unbounded" />
+ <element name="reference" minOccurs="0" maxOccurs="unbounded" type="anyURI" />
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="name" type="NCName" use="required" />
+ <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1" />
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+ <!-- a multiplicity 1..1 or 0..n sample
+ <reference>StockQuoteComponent</reference> - type must be URI
+ a multiplicity 1..n or 0..n sample
+ <reference>StockQuoteComponent1</reference> - type must be URI
+ <reference>StockQuoteComponent2</reference>
+ -->
+
+
<element name="interface" type="sca:Interface" abstract="true"/>
<complexType name="Interface" abstract="true"/>
- <element name="binding" type="sca:Binding" abstract="true" />
- <complexType name="Binding" abstract="true">
- <attribute name="uri" type="anyURI" use="optional" />
+ <complexType name="CompositeReferenceType">
+ <sequence>
+ <element ref="sca:interface" minOccurs="1" maxOccurs="1" />
+ <element ref="sca:binding" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <attribute name="name" type="NCName" use="required" />
+ <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1" />
+ <attribute name="override" type="sca:OverrideOptions" default="may" use="optional" />
+ <anyAttribute namespace="##any" processContents="lax" />
</complexType>
<complexType name="ServiceType">
@@ -52,35 +93,12 @@
<element ref="sca:interface" minOccurs="1" maxOccurs="1" />
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
</sequence>
- <!-- a multiplicity 1..1 or 0..n sample
- <reference>StockQuoteComponent</reference> - type must be URI
- a multiplicity 1..n or 0..n sample
- <reference>StockQuoteComponent1</reference> - type must be URI
- <reference>StockQuoteComponent2</reference>
- -->
<attribute name="name" type="NCName" use="required" />
<attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1" />
<attribute name="override" type="sca:OverrideOptions" default="may" use="optional" />
<anyAttribute namespace="##any" processContents="lax" />
</complexType>
- <simpleType name="Multiplicity">
- <restriction base="string">
- <enumeration value="0..1" />
- <enumeration value="1..1" />
- <enumeration value="0..n" />
- <enumeration value="1..n" />
- </restriction>
- </simpleType>
-
- <simpleType name="OverrideOptions">
- <restriction base="string">
- <enumeration value="no" />
- <enumeration value="may" />
- <enumeration value="must" />
- </restriction>
- </simpleType>
-
<complexType name="PropertyType">
<complexContent>
<extension base="anyType">
@@ -93,6 +111,11 @@
</complexContent>
</complexType>
+ <element name="binding" type="sca:Binding" abstract="true" />
+ <complexType name="Binding" abstract="true">
+ <attribute name="uri" type="anyURI" use="optional" />
+ </complexType>
+
<complexType name="Component">
<sequence>
<element ref="sca:implementation" minOccurs="1" maxOccurs="1" />
@@ -126,4 +149,30 @@
<element name="implementation" type="sca:Implementation" abstract="true" />
<complexType name="Implementation" abstract="true"/>
+ <complexType name="Wire">
+ <sequence>
+ <element name="source" type="anyURI" minOccurs="1" maxOccurs="1" />
+ <element name="target" type="anyURI" minOccurs="1" maxOccurs="1" />
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ <anyAttribute namespace="##any" processContents="lax" />
+ </complexType>
+
+ <simpleType name="Multiplicity">
+ <restriction base="string">
+ <enumeration value="0..1" />
+ <enumeration value="1..1" />
+ <enumeration value="0..n" />
+ <enumeration value="1..n" />
+ </restriction>
+ </simpleType>
+
+ <simpleType name="OverrideOptions">
+ <restriction base="string">
+ <enumeration value="no" />
+ <enumeration value="may" />
+ <enumeration value="must" />
+ </restriction>
+ </simpleType>
+
</schema>
Modified: incubator/tuscany/cpp/sca/xsd/sca.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/xsd/sca.xsd?rev=433441&r1=433440&r2=433441&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/xsd/sca.xsd (original)
+++ incubator/tuscany/cpp/sca/xsd/sca.xsd Mon Aug 21 17:29:37 2006
@@ -19,7 +19,6 @@
xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
<include schemaLocation="sca-core.xsd" />
- <include schemaLocation="sca-composite.xsd" />
<include schemaLocation="sca-interface-java.xsd" />
<include schemaLocation="sca-interface-wsdl.xsd" />
<include schemaLocation="sca-interface-cpp.xsd" />
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org