diff options
Diffstat (limited to '')
15 files changed, 170 insertions, 9 deletions
diff --git a/java/sca/modules/assembly-xsd/LICENSE b/java/sca/modules/assembly-xsd/LICENSE index bfded7c6a9..646cd58e09 100644 --- a/java/sca/modules/assembly-xsd/LICENSE +++ b/java/sca/modules/assembly-xsd/LICENSE @@ -242,3 +242,40 @@ JavaDoc, Interface Definition Files and XSD Files will at all times remain with No other rights are granted by implication, estoppel or otherwise. =============================================================================== + +This module includes XSD files under the following W3C(r) Software License: + +W3C(r) SOFTWARE NOTICE AND LICENSE +http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 + +This work (and included software, documentation such as READMEs, or other related items) +is being provided by the copyright holders under the following license. By obtaining, +using and/or copying this work, you (the licensee) agree that you have read, understood, +and will comply with the following terms and conditions. + +Permission to copy, modify, and distribute this software and its documentation, with or +without modification, for any purpose and without fee or royalty is hereby granted, provided +that you include the following on ALL copies of the software and documentation or portions +thereof, including modifications: + + 1. The full text of this NOTICE in a location viewable to users of the redistributed or + derivative work. + 2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. + If none exist, the W3C Software Short Notice should be included (hypertext is preferred, + text is permitted) within the body of any redistributed or derivative code. + 3. Notice of any changes or modifications to the files, including the date changes were + made. (We recommend you provide URIs to the location from which the code is derived.) + +THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO +REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES +OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR +DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER +RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL +DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. + +The name and trademarks of copyright holders may NOT be used in advertising or publicity +pertaining to the software without specific, written prior permission. Title to copyright +in this software and any associated documentation will at all times remain with copyright +holders. diff --git a/java/sca/modules/assembly-xsd/NOTICE b/java/sca/modules/assembly-xsd/NOTICE index 6dcfe88195..637bbaccf9 100644 --- a/java/sca/modules/assembly-xsd/NOTICE +++ b/java/sca/modules/assembly-xsd/NOTICE @@ -10,3 +10,14 @@ copyright: (c) Copyright SCA Collaboration 2006, 2007 +This product also includes software under the W3C(r) Software License +(see the LICENSE file contained in this distribution), with the following +copyright: + +Copyright (c) 2004 World Wide Web Consortium (Massachusetts Institute of Technology, +European Research Consortium for Informatics and Mathematics, Keio University). +All Rights Reserved. This work is distributed under the W3C(r) Software License [1] +in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 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 6f64453635..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 @@ -41,7 +41,7 @@ <attribute name="requestConnection" type="QName"/> <attribute name="responseConnection" type="QName"/> <attribute name="operationProperties" type="QName"/> - <anyAttribute/> + <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> @@ -136,4 +136,5 @@ <element name="binding.jms" type="sca:JMSBinding" substitutionGroup="sca:binding"/> + </schema> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd index 3e92de193b..2dd44f8e06 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd @@ -6,6 +6,11 @@ xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" xmlns:wsa="http://www.w3.org/2004/12/addressing" elementFormDefault="qualified"> + + <import namespace="http://www.w3.org/2004/08/wsdl-instance" + schemaLocation="wsdli.xsd" /> + <!-- import namespace="http://www.w3.org/2005/08/addressing" + schemaLocation="ws-addr.xsd" /--> <include schemaLocation="sca-core.xsd"/> @@ -15,11 +20,14 @@ <complexContent> <extension base="sca:Binding"> <sequence> + <!-- element ref="wsa:EndpointReference" minOccurs="0" + maxOccurs="unbounded"/--> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="wsdlElement" type="anyURI" use="optional"/> - <anyAttribute namespace="##any" processContents="lax"/> + <attribute ref="wsdli:wsdlLocation" use="optional"/> + <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd index a22d8ac075..caf5d8010f 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd @@ -10,9 +10,9 @@ <element name="contribution" type="sca:ContributionType"/> <complexType name="ContributionType"> <sequence> - <element name="deployable" type="sca:DeployableType" minOccurs="1" maxOccurs="unbounded"/> - <element name="import" type="sca:ImportType" minOccurs="0" maxOccurs="unbounded"/> - <element name="export" type="sca:ExportType" minOccurs="0" maxOccurs="unbounded"/> + <element name="deployable" type="sca:DeployableType" minOccurs="0" maxOccurs="unbounded"/> + <element ref="sca:import" minOccurs="0" maxOccurs="unbounded"/> + <element ref="sca:export" minOccurs="0" maxOccurs="unbounded"/> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> <anyAttribute namespace="##other" processContents="lax"/> @@ -26,6 +26,7 @@ <anyAttribute namespace="##other" processContents="lax"/> </complexType> + <element name="import" type="sca:ImportType"/> <complexType name="ImportType"> <sequence> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> @@ -35,11 +36,30 @@ <anyAttribute namespace="##other" processContents="lax"/> </complexType> + <element name="export" type="sca:ExportType"/> <complexType name="ExportType"> <sequence> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="namespace" type="string" use="required"/> <anyAttribute namespace="##other" processContents="lax"/> - </complexType> + </complexType> + + <element name="import.resource" type="sca:ImportResourceType" substitutionGroup="sca:import"/> + <complexType name="ImportResourceType"> + <complexContent> + <extension base="sca:ImportType"> + <attribute name="uri" type="anyURI" use="optional"/> + </extension> + </complexContent> + </complexType> + + <element name="export.resource" type="sca:ExportResourceType" substitutionGroup="sca:export"/> + <complexType name="ExportResourceType"> + <complexContent> + <extension base="sca:ExportType"> + <attribute name="uri" type="anyURI" use="optional"/> + </extension> + </complexContent> + </complexType> </schema>
\ No newline at end of file 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 a7ca0433f9..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 @@ -123,7 +123,7 @@ <attribute name="element" type="QName" use="optional"/> <attribute name="many" type="boolean" default="false" use="optional"/> - <attribute name="noDefault" type="boolean" default="false" + <attribute name="mustSupply" type="boolean" default="false" use="optional"/> <anyAttribute namespace="##any" processContents="lax"/> <!-- an extension point ; attribute-based only --> @@ -149,7 +149,7 @@ <element name="binding" type="sca:Binding" abstract="true"/> <complexType name="Binding" abstract="true"> - <sequence> + <sequence> <element name="operation" type="sca:Operation" minOccurs="0" maxOccurs="unbounded" /> </sequence> @@ -157,7 +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> + </complexType> <element name="bindingType" type="sca:BindingType"/> <complexType name="BindingType"> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca.xsd index 88edad794c..e4471a4f51 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca.xsd @@ -18,6 +18,8 @@ <include schemaLocation="sca-contributions.xsd"/> + <include schemaLocation="sca-contributions.xsd"/> + <include schemaLocation="sca-definitions.xsd"/> <include schemaLocation="sca-policy.xsd"/> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd index c93a1d72de..d400810835 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd @@ -35,6 +35,7 @@ maxOccurs="unbounded"/> </sequence> <attribute name="title" type="string" use="optional"/> + <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd index d0da5421ec..788571de7b 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd @@ -34,6 +34,7 @@ <any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> + <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd index ff48b97d7a..bd36a8f52f 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd @@ -34,6 +34,7 @@ <any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> + <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> 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..b998427ecb --- /dev/null +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd @@ -0,0 +1,40 @@ +<?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="WireFormatJMSTextXMLType"/> + <element name="wireFormat.jmsTextXML" type="t:WireFormatJMSTextXMLType"/> + + <complexType name="WireFormatJMSTextType"/> + <element name="wireFormat.jmsText" type="t:WireFormatJMSTextType"/> + + <complexType name="WireFormatJMSBytesType"/> + <element name="wireFormat.jmsBytes" type="t:WireFormatJMSBytesType"/> + + <complexType name="WireFormatJMSObjectType"/> + <element name="wireFormat.jmsObject" type="t:WireFormatJMSObjectType"/> + +</schema> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd index 7c79738898..bacfdda781 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd @@ -34,6 +34,7 @@ <any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> + <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd index 821f323d73..5af65aced2 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd @@ -35,6 +35,7 @@ maxOccurs="unbounded"/> </sequence> <attribute name="title" type="string" use="optional"/> + <anyAttribute namespace="##any" processContents="lax"/> </extension> </complexContent> </complexType> 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 032143bd13..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 @@ -20,6 +20,8 @@ <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"> + <import namespace="http://www.w3.org/2004/08/wsdl-instance" schemaLocation="wsdli.xsd"/> + <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-all.xsd"/> <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-data-helper.xsd"/> @@ -27,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"/> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/wsdli.xsd b/java/sca/modules/assembly-xsd/src/main/resources/wsdli.xsd new file mode 100644 index 0000000000..79af5e9363 --- /dev/null +++ b/java/sca/modules/assembly-xsd/src/main/resources/wsdli.xsd @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"--> +<!-- $Id: wsdl-instance.xsd,v 1.1 2004/08/03 16:02:04 hugo Exp $ --> +<!-- + W3C XML Schema defined in the Web Services Description (WSDL) + Version 2.0 specification + http://www.w3.org/TR/wsdl20 + + Copyright (c) 2004 World Wide Web Consortium, + + (Massachusetts Institute of Technology, European Research Consortium for + Informatics and Mathematics, Keio University). All Rights Reserved. This + work is distributed under the W3C(r) Software License [1] in the hope that + it will be useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 +--> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" targetNamespace="http://www.w3.org/2004/08/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified"> + + <xs:attribute name="wsdlLocation"> + <xs:annotation> + <xs:documentation> + This attribute can be used to provide some hints on where + additional WSDL information for a given namespace can be + found in order to help with QName resolution + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:list itemType="xs:anyURI"/> + </xs:simpleType> + </xs:attribute> + +</xs:schema> |