Author: lresende
Date: Sat May 2 00:40:05 2009
New Revision: 770873
URL: http://svn.apache.org/viewvc?rev=770873&view=rev
Log:
TUSCANY-2968 - Updating binding-http schema and moving wireFormat and
operationSelector to tuscany-sca-core.xsd to be sharable
Added:
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-core.xsd
- copied, changed from r770870,
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
Copied:
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-core.xsd
(from r770870,
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd)
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-core.xsd?p2=tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-core.xsd&p1=tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd&r1=770870&r2=770873&rev=770873&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-core.xsd
Sat May 2 00:40:05 2009
@@ -17,25 +17,21 @@
* 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.0";
xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
elementFormDefault="qualified">
-
- <import namespace="http://www.osoa.org/xmlns/sca/1.0";
schemaLocation="sca-core.xsd"/>
-
- <element name="binding.http" type="t:HTTPBinding"/>
+
+ <!-- wire formats -->
+ <element name="wireFormat" type="t:WireFormat" abstract="true"/>
+
+ <complexType name="WireFormat" abstract="true"/>
+
+ <!-- operation selectors -->
+ <element name="operationSelector" type="t:OperationSelector"
abstract="true"/>
+
+ <complexType name="OperationSelector" abstract="true"/>
- <complexType name="HTTPBinding">
- <complexContent>
- <extension base="sca:Binding">
- <sequence>
- <any namespace="##targetNamespace" processContents="lax"
minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-</schema>
+</schema>
\ No newline at end of file
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd?rev=770873&r1=770872&r2=770873&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
Sat May 2 00:40:05 2009
@@ -25,6 +25,8 @@
<import namespace="http://www.osoa.org/xmlns/sca/1.0";
schemaLocation="sca-core.xsd"/>
+ <include schemaLocation="tuscany-core.xsd"/>
+
<element name="binding.http" type="t:HTTPBinding"/>
<complexType name="HTTPBinding">
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd?rev=770873&r1=770872&r2=770873&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
Sat May 2 00:40:05 2009
@@ -24,6 +24,8 @@
elementFormDefault="qualified">
<import namespace="http://www.osoa.org/xmlns/sca/1.0";
schemaLocation="sca-binding-jms.xsd"/>
+
+ <include schemaLocation="tuscany-core.xsd"/>
<!-- these schema types are not actually used at the moment as we rely on
any elements in the underlying JMS binding schema to pull in
wireFormat
@@ -32,9 +34,6 @@
<!-- wire formats -->
-
- <element name="wireFormat" type="t:WireFormat" abstract="true"/>
- <complexType name="WireFormat" abstract="true"/>
<complexType name="WireFormatJMSDefaultType">
<complexContent>
@@ -109,11 +108,7 @@
substitutionGroup="t:wireFormat"/>
- <!-- operation selectors -->
-
- <element name="operationSelector" type="t:OperationSelector"
abstract="true"/>
- <complexType name="OperationSelector" abstract="true"/>
-
+ <!-- operation selectors -->
<complexType name="OperationSelectorJMSDefaultType">
<complexContent>
<extension base="t:OperationSelector"/>
