Author: jsdelfino
Date: Thu Apr 27 02:31:42 2006
New Revision: 397489
URL: http://svn.apache.org/viewcvs?rev=397489&view=rev
Log:
Fix for TUSCANY-141 - changed XSD to place import statements at the top of SCDL
files
Modified:
incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd
incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd
Modified: incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd?rev=397489&r1=397488&r2=397489&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd
(original)
+++ incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd Thu
Apr 27 02:31:42 2006
@@ -57,12 +57,12 @@
<element name="moduleFragment" type="sca:ModuleFragment"/>
<complexType name="ModuleFragment">
<sequence>
+ <!-- This is a Tuscany extension -->
+ <element minOccurs="0" maxOccurs="unbounded"
name="import" type="sca:Import"/>
<element minOccurs="0" maxOccurs="unbounded"
name="entryPoint" type="sca:EntryPoint"/>
<element minOccurs="0" maxOccurs="unbounded"
name="component" type="sca:Component"/>
<element minOccurs="0" maxOccurs="unbounded"
name="externalService" type="sca:ExternalService"/>
<element minOccurs="0" maxOccurs="unbounded"
name="wire" type="sca:ModuleWire"/>
- <!-- This is a Tuscany extension -->
- <element minOccurs="0" maxOccurs="unbounded"
name="import" type="sca:Import"/>
<any namespace="##other" processContents="lax"
minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="name" type="NCName" use="required"/>
Modified:
incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd?rev=397489&r1=397488&r2=397489&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd
(original)
+++
incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd
Thu Apr 27 02:31:42 2006
@@ -30,8 +30,23 @@
<sequence>
<any namespace="##other"
processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
- <attribute name="namespace" type="anyURI"
use="required"/>
+ <attribute name="namespace" type="anyURI"
use="optional"/>
<attribute name="location" type="anyURI"
use="required"/>
+ <anyAttribute namespace="##any"
processContents="lax"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <!-- This is a Tuscany extension -->
+ <element name="import.sdo" type="sca:SDOImport"
substitutionGroup="sca:import" sdo:name="importSdo"/>
+ <complexType name="SDOImport">
+ <complexContent>
+ <extension base="sca:Import">
+ <sequence>
+ <any namespace="##other"
processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="location" type="anyURI"
use="optional"/>
+ <attribute name="factory" type="NCName"
use="optional"/>
<anyAttribute namespace="##any"
processContents="lax"/>
</extension>
</complexContent>
