diff options
Diffstat (limited to 'java/sca/modules/assembly-xsd/src')
4 files changed, 40 insertions, 38 deletions
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd index 1aaf407dfc..93718aaa35 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd @@ -136,22 +136,5 @@ <element name="binding.jms" type="sca:JMSBinding" substitutionGroup="sca:binding"/> - - <complexType name="WireFormatJMSDefaultType"> - <complexContent> - <extension base="sca:WireFormatType"/> - </complexContent> - </complexType> - - <element name="wireFormat.jmsDefault" type="sca:WireFormatJMSDefaultType" - substitutionGroup="sca:wireFormat"/> - - <complexType name="OperationSelectorJMSDefaultType"> - <complexContent> - <extension base="sca:OperationSelectorType"/> - </complexContent> - </complexType> - - <element name="operationSelector.jmsDefault" type="sca:OperationSelectorJMSDefaultType" - substitutionGroup="sca:operationSelector"/> + </schema> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd index da31c25baf..f03d0eab01 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-core.xsd @@ -149,9 +149,7 @@ <element name="binding" type="sca:Binding" abstract="true"/> <complexType name="Binding" abstract="true"> - <sequence> - <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" /> - <element ref="sca:operationSelector" minOccurs="0" maxOccurs="1" /> + <sequence> <element name="operation" type="sca:Operation" minOccurs="0" maxOccurs="unbounded" /> </sequence> @@ -159,23 +157,7 @@ <attribute name="name" type="QName" use="optional"/> <attribute name="requires" type="sca:listOfQNames" use="optional"/> <attribute name="policySets" type="sca:listOfQNames" use="optional"/> - </complexType> - - <element name="wireFormat" type="sca:WireFormatType"/> - <complexType name="WireFormatType" abstract="true"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - </sequence> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> - - <element name="operationSelector" type="sca:OperationSelectorType"/> - <complexType name="OperationSelectorType" abstract="true"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - </sequence> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> + </complexType> <element name="bindingType" type="sca:BindingType"/> <complexType name="BindingType"> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd new file mode 100644 index 0000000000..3c39756dbb --- /dev/null +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd @@ -0,0 +1,36 @@ +<?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.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-binding-jms.xsd"/> + + <complexType name="WireFormatJMSDefaultType"/> + + <element name="wireFormat.jmsDefault" type="t:WireFormatJMSDefaultType"/> + + <complexType name="OperationSelectorJMSDefaultType"/> + + <element name="operationSelector.jmsDefault" type="t:OperationSelectorJMSDefaultType"/> + +</schema> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd index 232e4add0e..8bf3766eab 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd @@ -29,6 +29,7 @@ <include schemaLocation="tuscany-sca-binding-dwr.xsd"/> <include schemaLocation="tuscany-sca-binding-http.xsd"/> <include schemaLocation="tuscany-sca-binding-jsonrpc.xsd"/> + <include schemaLocation="tuscany-sca-binding-jms.xsd"/> <include schemaLocation="tuscany-sca-binding-notification.xsd"/> <include schemaLocation="tuscany-sca-binding-rmi.xsd"/> <include schemaLocation="tuscany-sca-binding-rss.xsd"/> |