diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-05 00:37:39 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-05 00:37:39 +0000 |
| commit | 49e66a40bf59388330c69f3ca44fa3292d345f80 (patch) | |
| tree | 1092660e697ae8071b1cd48d1570e33c902e712c | |
| parent | 27cf4abf283fc8bb4c0198afc574b0103b8d258e (diff) | |
Spliting schemas to assembly-xsd and assembly-xsd-osoa
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@750259 13f79535-47bb-0310-9956-ffa450edef68
55 files changed, 351 insertions, 1324 deletions
diff --git a/java/sca/modules/assembly-xml-osoa/pom.xml b/java/sca/modules/assembly-xml-osoa/pom.xml index ccfc1863d7..2904afd3e3 100644 --- a/java/sca/modules/assembly-xml-osoa/pom.xml +++ b/java/sca/modules/assembly-xml-osoa/pom.xml @@ -116,7 +116,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly-xsd</artifactId> + <artifactId>tuscany-assembly-xsd-osoa</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/java/sca/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/java/sca/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java index c799a32fee..62b6048ea7 100644 --- a/java/sca/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java +++ b/java/sca/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java @@ -59,7 +59,7 @@ import org.xml.sax.XMLReader; * @version $Rev$ $Date$ */ public class ReadDocumentTestCase { - private static final String TUSCANY_10_XSD = "sca-10/tuscany-sca.xsd"; + private static final String TUSCANY_10_XSD = "tuscany-sca.xsd"; private static URLArtifactProcessor<Object> documentProcessor; private static ModelResolver resolver; diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java index 42f8ed31e7..e1d1794f3c 100644 --- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java +++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java @@ -58,7 +58,7 @@ import org.xml.sax.XMLReader; * @version $Rev$ $Date$ */ public class ReadDocumentTestCase { - private static final String TUSCANY_11_XSD = "sca-11/tuscany-sca-1.1.xsd"; + private static final String TUSCANY_11_XSD = "tuscany-sca-1.1.xsd"; private static URLArtifactProcessor<Object> documentProcessor; private static ModelResolver resolver; diff --git a/java/sca/modules/assembly-xsd-osoa/LICENSE b/java/sca/modules/assembly-xsd-osoa/LICENSE new file mode 100644 index 0000000000..646cd58e09 --- /dev/null +++ b/java/sca/modules/assembly-xsd-osoa/LICENSE @@ -0,0 +1,281 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + + + +=============================================================================== + +Apache Tuscany SCA for Java Subcomponents +=========================================: + +The Tuscany SCA for Java release includes a number of subcomponents with +separate copyright notices and license terms. Your use of the source +code for the these subcomponents is subject to the terms and +conditions of the following licenses. + +=============================================================================== + +This module includes XSD files under the following SCA Collaboration license: + +License for the Service Component Architecture JavaDoc, Interface Definition files and XSD files. + +Permission to copy, make derivative works of, and distribute the Service Component Architecture +JavaDoc, Interface Definition Files and XSD files in any medium without fee or royalty as part +of a compliant implementation of the Service Component Architecture Specification is hereby granted. +The Service Components Architecture Specification may be found at the following location: + + http://www.osoa.org/download/attachments/35/SCA_AssemblyModel_V100.pdf + +THE SERVICE COMPONENT ARCHITECTURE SPECIFICATION AND THE JAVADOC, INTERFACE DEFINITION FILES AND XSD FILES +ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS +SPECIFICATION OR THE JAVADOC, INTERFACE DEFINITION FILES AND XSD FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, +INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, +NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE +SERVICE COMPONENT ARCHITECTURE SPECIFICATION OR THE JAVADOC, INTERFACE DEFINTION FILES OR XSD FILES. + +The name and trademarks of the Authors may NOT be used in any manner, including advertising or +publicity pertaining to the Service Component Architecture Specification or its contents without specific, +written prior permission. Title to copyright in the Service Component Architecture Specification and the +JavaDoc, Interface Definition Files and XSD Files will at all times remain with the Authors. + +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-osoa/META-INF/MANIFEST.MF b/java/sca/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..7d6d0951f4 --- /dev/null +++ b/java/sca/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Assembly Model XML Schemas
+Bnd-LastModified: 1225397088359
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Description: Apache Tuscany SCA Assembly Model XML Schemas
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-DocURL: http://www.apache.org/
+Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xsd
+
diff --git a/java/sca/modules/assembly-xsd-osoa/NOTICE b/java/sca/modules/assembly-xsd-osoa/NOTICE new file mode 100644 index 0000000000..91c3b75575 --- /dev/null +++ b/java/sca/modules/assembly-xsd-osoa/NOTICE @@ -0,0 +1,23 @@ +${pom.name} +Copyright (c) 2005 - 2009 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + +This product also includes software under the SCA Collaboration license +(see the LICENSE file contained in this distribution), with the following +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-11/tuscany-sca-1.1.xsd b/java/sca/modules/assembly-xsd-osoa/pom.xml index 27e8760bb5..88c55f9bdd 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd +++ b/java/sca/modules/assembly-xsd-osoa/pom.xml @@ -17,17 +17,14 @@ * 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.1"> - - <import namespace="http://www.w3.org/2004/08/wsdl-instance" schemaLocation="wsdli.xsd"/> - - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-1.1-schema-200803.xsd"/> - - <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/> - <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/> - <include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/> - <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/> - - <include schemaLocation="tuscany-sca-1.1-implementation-node.xsd"/> -</schema>
\ No newline at end of file +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-modules</artifactId> + <version>2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>tuscany-assembly-xsd-osoa</artifactId> + <name>Apache Tuscany SCA Assembly Model XSD Files based on OSOA spec</name> +</project> diff --git a/java/sca/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema new file mode 100644 index 0000000000..69b2701e30 --- /dev/null +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema @@ -0,0 +1,18 @@ +# 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. +# +tuscany-sca.xsd
\ No newline at end of file diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-all.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd index 68455a3474..68455a3474 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-all.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-binding-ejb.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd index 26bedfcce5..26bedfcce5 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-binding-ejb.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-binding-sca.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd index 02703402ef..02703402ef 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-binding-sca.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-binding-webservice.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd index 2dd44f8e06..2dd44f8e06 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-binding-webservice.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-contributions.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd index caf5d8010f..caf5d8010f 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-contributions.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-core.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd index f03d0eab01..f03d0eab01 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-core.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-definitions.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd index 0249882a92..0249882a92 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-definitions.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-bpel.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd index 87b443fb36..87b443fb36 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-bpel.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-composite.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd index 99669bc672..99669bc672 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-composite.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-java.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd index f9d8171b8e..f9d8171b8e 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-java.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-jee.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd index 83e6bb75bf..83e6bb75bf 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-jee.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-web.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd index a1adf10fd9..a1adf10fd9 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-implementation-web.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-interface-java.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd index 81f939bdb4..81f939bdb4 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-interface-java.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-interface-wsdl.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd index c1fdfd8f3c..c1fdfd8f3c 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-interface-wsdl.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-policy.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd index 2c4875f36c..2c4875f36c 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca-policy.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca.xsd index a177816cdd..a177816cdd 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/sca.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/sca.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-binding-dwr.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd index 788571de7b..788571de7b 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-binding-dwr.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-binding-http.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd index bd36a8f52f..bd36a8f52f 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-binding-http.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd index bacfdda781..bacfdda781 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-binding-jsonrpc.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-binding-rmi.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd index 26be6feae5..26be6feae5 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-binding-rmi.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-implementation-node.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd index 1b5c8aece2..1b5c8aece2 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca-implementation-node.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd index 4557cda947..4557cda947 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/tuscany-sca.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/wsdli.xsd b/java/sca/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd index 79af5e9363..79af5e9363 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-10/wsdli.xsd +++ b/java/sca/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd diff --git a/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema index 51584e32ce..5007705d41 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema +++ b/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema @@ -15,5 +15,4 @@ # specific language governing permissions and limitations # under the License. # -sca-11/tuscany-sca-1.1.xsd -sca-10/tuscany-sca.xsd
\ No newline at end of file +tuscany-sca-1.1.xsd
\ No newline at end of file diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-1.1-schema-200803.xsd deleted file mode 100644 index f2fb26c373..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-1.1-schema-200803.xsd +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-interface-java-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-interface-wsdl-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-interface-cpp-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-interface-c-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-implementation-java-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-implementation-composite-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-implementation-cpp-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-implementation-c-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-implementation-bpel-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-binding-webservice-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-binding-jms-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-binding-sca-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-definitions-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-policy-1.1-schema-200803.xsd"/>
-
- <include schemaLocation="sca-contribution-1.1-schema-200803.xsd"/>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-binding-sca-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-binding-sca-1.1-schema-200803.xsd deleted file mode 100644 index 4c0384fc45..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-binding-sca-1.1-schema-200803.xsd +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <!-- SCA Binding -->
- <element name="binding.sca" type="sca:SCABinding" substitutionGroup="sca:binding"/>
- <complexType name="SCABinding">
- <complexContent>
- <extension base="sca:Binding"/>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-1.1-schema-200803.xsd deleted file mode 100644 index ec63e7daed..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-1.1-schema-200803.xsd +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <!-- Contribution -->
- <element name="contribution" type="sca:ContributionType"/>
- <complexType name="ContributionType">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <element name="deployable" type="sca:DeployableType" maxOccurs="unbounded"/>
- <element ref="sca:importBase" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="sca:exportBase" minOccurs="0" maxOccurs="unbounded"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Deployable -->
- <complexType name="DeployableType">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="composite" type="QName" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Import -->
- <element name="importBase" type="sca:Import" abstract="true" />
- <complexType name="Import" abstract="true">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <element name="import" type="sca:ImportType" substitutionGroup="sca:importBase"/>
- <complexType name="ImportType">
- <complexContent>
- <extension base="sca:Import">
- <attribute name="namespace" type="string" use="required"/>
- <attribute name="location" type="anyURI" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Export -->
- <element name="exportBase" type="sca:Export" abstract="true" />
- <complexType name="Export" abstract="true">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <element name="export" type="sca:ExportType" substitutionGroup="sca:exportBase"/>
- <complexType name="ExportType">
- <complexContent>
- <extension base="sca:Export">
- <attribute name="namespace" type="string" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-c-1.1-cd02.xsd deleted file mode 100644 index 0769e33a5f..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-c-1.1-cd02.xsd +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-contribution-1.1-schema-200803.xsd" />
-
- <element name="export.c" type="sca:CExport"
- substitutionGroup="sca:exportBase" />
-
- <complexType name="CExport">
- <complexContent>
- <extension base="sca:Export">
- <attribute name="name" type="QName" use="required" />
- <attribute name="path" type="string" use="optional" />
- </extension>
- </complexContent>
- </complexType>
-
- <element name="import.c" type="sca:CImport"
- substitutionGroup="sca:importBase" />
-
- <complexType name="CImport">
- <complexContent>
- <extension base="sca:Import">
- <attribute name="name" type="QName" use="required" />
- <attribute name="location" type="string" use="required" />
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-cpp-1-1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-cpp-1-1-cd02.xsd deleted file mode 100644 index c92ac47580..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-contribution-cpp-1-1-cd02.xsd +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-contribution-1.1-schema-200803.xsd" />
-
- <element name="export.cpp" type="sca:CPPExport"
- substitutionGroup="sca:exportBase" />
-
- <complexType name="CPPExport">
- <complexContent>
- <extension base="sca:Export">
- <attribute name="name" type="QName" use="required" />
- <attribute name="path" type="string" use="optional" />
- </extension>
- </complexContent>
- </complexType>
-
- <element name="import.cpp" type="sca:CPPImport"
- substitutionGroup="sca:importBase" />
-
- <complexType name="CPPImport">
- <complexContent>
- <extension base="sca:Import">
- <attribute name="name" type="QName" use="required" />
- <attribute name="location" type="string" use="required" />
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
\ No newline at end of file diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-core-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-core-1.1-schema-200803.xsd deleted file mode 100644 index 285d7645cb..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-core-1.1-schema-200803.xsd +++ /dev/null @@ -1,443 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
- OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
- <!-- Common extension base for SCA definitions -->
- <complexType name="CommonExtensionBase">
- <sequence>
- <element ref="sca:documentation" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <anyAttribute namespace="##other" processContents="lax"/>
- </complexType>
-
- <element name="documentation" type="sca:Documentation"/>
- <complexType name="Documentation" mixed="true">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute ref="xml:lang"/>
- </complexType>
-
- <!-- Component Type -->
- <element name="componentType" type="sca:ComponentType"/>
- <complexType name="ComponentType">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <element ref="sca:implementation" minOccurs="0"/>
- <choice minOccurs="0" maxOccurs="unbounded">
- <element name="service" type="sca:ComponentService"/>
- <element name="reference" type="sca:ComponentTypeReference"/>
- <element name="property" type="sca:Property"/>
- </choice>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="constrainingType" type="QName" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Composite -->
- <element name="composite" type="sca:Composite"/>
- <complexType name="Composite">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <element name="include" type="anyURI" minOccurs="0" maxOccurs="unbounded"/>
- <choice minOccurs="0" maxOccurs="unbounded">
- <element name="service" type="sca:Service"/>
- <element name="property" type="sca:Property"/>
- <element name="component" type="sca:Component"/>
- <element name="reference" type="sca:Reference"/>
- <element name="wire" type="sca:Wire"/>
- </choice>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="targetNamespace" type="anyURI" use="required"/>
- <attribute name="local" type="boolean" use="optional" default="false"/>
- <attribute name="autowire" type="boolean" use="optional" default="false"/>
- <attribute name="constrainingType" type="QName" use="optional"/>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Contract base type for Service, Reference -->
- <complexType name="Contract" abstract="true">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
- <element ref="sca:binding" minOccurs="0" maxOccurs="unbounded" />
- <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="name" type="NCName" use="required" />
- <attribute name="requires" type="sca:listOfQNames" use="optional" />
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Service -->
- <complexType name="Service">
- <complexContent>
- <extension base="sca:Contract">
- <attribute name="promote" type="anyURI" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Interface -->
- <element name="interface" type="sca:Interface" abstract="true"/>
- <complexType name="Interface" abstract="true">
- <complexContent>
- <extension base="sca:CommonExtensionBase"/>
- </complexContent>
- </complexType>
-
- <!-- Reference -->
- <complexType name="Reference">
- <complexContent>
- <extension base="sca:Contract">
- <attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- <attribute name="promote" type="sca:listOfAnyURIs" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Property -->
- <complexType name="SCAPropertyBase" mixed="true">
- <sequence>
- <any namespace="##any" processContents="lax" minOccurs="0"/>
- <!-- NOT an extension point; This any exists to accept
- the element-based or complex type property
- i.e. no element-based extension point under "sca:property" -->
- </sequence>
- <!-- mixed="true" to handle simple type -->
- <attribute name="requires" type="sca:listOfQNames" use="optional" />
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- </complexType>
-
- <complexType name="Property" mixed="true">
- <complexContent mixed="true">
- <extension base="sca:SCAPropertyBase">
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="type" type="QName" use="optional"/>
- <attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional" default="false"/>
- <attribute name="mustSupply" type="boolean" use="optional" default="false"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- <!-- extension defines the place to hold default value -->
- <!-- an extension point ; attribute-based only -->
- </complexContent>
- </complexType>
-
- <!-- ConstrainingProperty is equivalent to the Property type but removes
- the capability to contain a value -->
- <complexType name="ConstrainingProperty" mixed="true">
- <complexContent mixed="true">
- <restriction base="sca:Property">
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="type" type="QName" use="optional"/>
- <attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional" default="false"/>
- <attribute name="mustSupply" type="boolean" use="optional" default="false"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </restriction>
- </complexContent>
- </complexType>
-
- <complexType name="PropertyValue" mixed="true">
- <complexContent mixed="true">
- <extension base="sca:SCAPropertyBase">
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="type" type="QName" use="optional"/>
- <attribute name="element" type="QName" use="optional"/>
- <attribute name="many" type="boolean" use="optional" default="false"/>
- <attribute name="source" type="string" use="optional"/>
- <attribute name="file" type="anyURI" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- <!-- an extension point ; attribute-based only -->
- </complexContent>
- </complexType>
-
- <!-- Binding -->
- <element name="binding" type="sca:Binding" abstract="true"/>
- <complexType name="Binding" abstract="true">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
- <element ref="sca:operationSelector" minOccurs="0" maxOccurs="1" />
- </sequence>
- <attribute name="uri" type="anyURI" use="optional"/>
- <attribute name="name" type="NCName" use="optional"/>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Binding Type -->
- <element name="bindingType" type="sca:BindingType"/>
- <complexType name="BindingType">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="type" type="QName" use="required"/>
- <attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
- <attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- WireFormat Type -->
- <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>
-
- <!-- OperationSelector Type -->
- <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>
-
- <!-- Callback -->
- <element name="callback" type="sca:Callback"/>
- <complexType name="Callback">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <choice minOccurs="0" maxOccurs="unbounded">
- <element ref="sca:binding"/>
- <any namespace="##other" processContents="lax"/>
- </choice>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Component -->
- <complexType name="Component">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <element ref="sca:implementation" minOccurs="0"/>
- <choice minOccurs="0" maxOccurs="unbounded">
- <element name="service" type="sca:ComponentService"/>
- <element name="reference" type="sca:ComponentReference"/>
- <element name="property" type="sca:PropertyValue"/>
- </choice>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="constrainingType" type="QName" use="optional"/>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Component Service -->
- <complexType name="ComponentService">
- <complexContent>
- <extension base="sca:Contract">
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Constraining Service -->
- <complexType name="ConstrainingService">
- <complexContent>
- <restriction base="sca:ComponentService">
- <sequence>
- <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
- <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="name" type="NCName" use="required" />
- </restriction>
- </complexContent>
- </complexType>
-
-
- <!-- Component Reference -->
- <complexType name="ComponentReference">
- <complexContent>
- <extension base="sca:Contract">
- <attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- <attribute name="nonOverridable" type="boolean" use="optional" default="false"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Constraining Reference -->
- <complexType name="ConstrainingReference">
- <complexContent>
- <restriction base="sca:ComponentReference">
- <sequence>
- <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
- <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="name" type="NCName" use="required" />
- <attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- </restriction>
- </complexContent>
- </complexType>
-
- <!-- Component Type Reference -->
- <complexType name="ComponentTypeReference">
- <complexContent>
- <restriction base="sca:ComponentReference">
- <sequence>
- <element ref="sca:documentation" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="sca:interface" minOccurs="0"/>
- <element ref="sca:binding" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="sca:callback" minOccurs="0"/>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="autowire" type="boolean" use="optional"/>
- <attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
- <attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- <anyAttribute namespace="##other" processContents="lax"/>
- </restriction>
- </complexContent>
- </complexType>
-
-
- <!-- Implementation -->
- <element name="implementation" type="sca:Implementation" abstract="true"/>
- <complexType name="Implementation" abstract="true">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <attribute name="requires" type="sca:listOfQNames" use="optional"/>
- <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Implementation Type -->
- <element name="implementationType" type="sca:ImplementationType"/>
- <complexType name="ImplementationType">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="type" type="QName" use="required"/>
- <attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
- <attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Wire -->
- <complexType name="Wire">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="source" type="anyURI" use="required"/>
- <attribute name="target" type="anyURI" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Include -->
- <element name="include" type="sca:Include"/>
- <complexType name="Include">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <attribute name="name" type="QName"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Constraining Type -->
- <element name="constrainingType" type="sca:ConstrainingType"/>
- <complexType name="ConstrainingType">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <sequence>
- <choice minOccurs="0" maxOccurs="unbounded">
- <element name="service" type="sca:ConstrainingService"/>
- <element name="reference" type="sca:ConstrainingReference"/>
- <element name="property" type="sca:ConstrainingProperty"/>
- </choice>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="targetNamespace" type="anyURI"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Intents within WSDL documents -->
- <attribute name="requires" type="sca:listOfQNames"/>
-
- <!-- Global attribute definition for @callback to mark a WSDL port type
- as having a callback interface defined in terms of a second port
- type. -->
- <attribute name="callback" type="anyURI"/>
-
- <!-- Miscellaneous simple type definitions -->
- <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>
-
- <simpleType name="listOfQNames">
- <list itemType="QName"/>
- </simpleType>
-
- <simpleType name="listOfAnyURIs">
- <list itemType="anyURI"/>
- </simpleType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-definitions-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-definitions-1.1-schema-200803.xsd deleted file mode 100644 index 5ecd364e19..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-definitions-1.1-schema-200803.xsd +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved.
- OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
- <include schemaLocation="sca-policy-1.1-schema-200803.xsd"/>
-
- <!-- Definitions -->
- <element name="definitions" type="sca:tDefinitions"/>
- <complexType name="tDefinitions">
- <complexContent>
- <extension base="sca:CommonExtensionBase">
- <choice minOccurs="0" maxOccurs="unbounded">
- <element ref="sca:intent"/>
- <element ref="sca:policySet"/>
- <element ref="sca:binding"/>
- <element ref="sca:bindingType"/>
- <element ref="sca:implementationType"/>
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
- </choice>
- <attribute name="targetNamespace" type="anyURI" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-c-1.1-cd02.xsd deleted file mode 100644 index 9adfca6f55..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-c-1.1-cd02.xsd +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd" />
-
- <element name="implementation.c" type="sca:CImplementation"
- substitutionGroup="sca:implementation" />
-
- <complexType name="CImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <element name="operation"
- type="sca:CImplementationFunction" minOccurs="0"
- maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="module" type="NCName" use="required" />
- <attribute name="path" type="string" use="optional" />
- <attribute name="library" type="boolean" use="optional" />
- <attribute name="componentType" type="string" use="required" />
- <attribute name="scope" type="sca:CImplementationScope"
- use="optional" />
- <attribute name="eagerInit" type="boolean"
- use="optional" />
- <attribute name="init" type="boolean" use="optional" />
- <attribute name="destoy" type="boolean" use="optional" />
- <attribute name="allowsPassByReference" type="boolean"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
- <simpleType name="CImplementationScope">
- <restriction base="string">
- <enumeration value="stateless" />
- <enumeration value="composite" />
- </restriction>
- </simpleType>
-
- <complexType name="CImplementationFunction">
- <attribute name="name" type="NCName" use="required" />
- <attribute name="allowsPassByReference" type="boolean"
- use="optional" />
- <attribute name="init" type="boolean" use="optional" />
- <attribute name="destoy" type="boolean" use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-composite-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-composite-1.1-schema-200803.xsd deleted file mode 100644 index 32113e31b8..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-composite-1.1-schema-200803.xsd +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <!-- Composite Implementation -->
- <element name="implementation.composite" type="sca:SCAImplementation" substitutionGroup="sca:implementation"/>
- <complexType name="SCAImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="QName" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-cpp-1.1-cd02.xsd deleted file mode 100644 index 18732d5e6a..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-cpp-1.1-cd02.xsd +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd" />
-
- <element name="implementation.cpp" type="sca:CPPImplementation"
- substitutionGroup="sca:implementation" />
- <complexType name="CPPImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <element name="function"
- type="sca:CPPImplementationFunction" minOccurs="0"
- maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="library" type="NCName" use="required" />
- <attribute name="header" type="NCName" use="required" />
- <attribute name="path" type="string" use="optional" />
- <attribute name="class" type="Name" use="optional" />
- <attribute name="componentType" type="string"
- use="optional" />
- <attribute name="scope"
- type="sca:CPPImplementationScope" use="optional" />
- <attribute name="eagerInit" type="boolean"
- use="optional" />
- <attribute name="allowsPassByReference" type="boolean"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
- <simpleType name="CPPImplementationScope">
- <restriction base="string">
- <enumeration value="stateless" />
- <enumeration value="composite" />
- </restriction>
- </simpleType>
-
- <complexType name="CPPImplementationFunction">
- <attribute name="name" type="NCName" use="required" />
- <attribute name="allowsPassByReference" type="boolean"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-java-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-java-1.1-schema-200803.xsd deleted file mode 100644 index f261febcf7..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-implementation-java-1.1-schema-200803.xsd +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <!-- Java Implementation -->
- <element name="implementation.java" type="sca:JavaImplementation" substitutionGroup="sca:implementation"/>
- <complexType name="JavaImplementation">
- <complexContent>
- <extension base="sca:Implementation">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="class" type="NCName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-c-1.1-cd02.xsd deleted file mode 100644 index 6f1a006a44..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-c-1.1-cd02.xsd +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd" />
-
- <element name="interface.c" type="sca:CInterface"
- substitutionGroup="sca:interface" />
-
- <complexType name="CInterface">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <element name="function" type="sca:CFunction"
- minOccurs="0" maxOccurs="unbounded" />
- <element name="callbackFunction"
- type="sca:CFunction" minOccurs="0" maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="header" type="string" use="required" />
- <attribute name="callbackHeader" type="string"
- use="optional" />
- <attribute name="remotable" type="boolean"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="CFunction">
- <attribute name="name" type="NCName" use="required" />
- <attribute name="oneWay" type="boolean" use="optional" />
- <attribute name="input" type="NCName" use="optional" />
- <attribute name="output" type="NCName" use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-cpp-1.1-cd02.xsd deleted file mode 100644 index 4f8da099d6..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-cpp-1.1-cd02.xsd +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd" />
-
- <element name="interface.cpp" type="sca:CPPInterface"
- substitutionGroup="sca:interface" />
-
- <complexType name="CPPInterface">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <element name="function" type="sca:CPPFunction"
- minOccurs="0" maxOccurs="unbounded" />
- <element name="callbackFunction" type="sca:CPPFunction"
- minOccurs="0" maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- <attribute name="header" type="string" use="required" />
- <attribute name="class" type="Name" use="required" />
- <attribute name="callbackHeader" type="string"
- use="optional" />
- <attribute name="callbackClass" type="Name"
- use="optional" />
- <attribute name="remotable" type="boolean"
- use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="CPPFunction">
- <attribute name="name" type="NCName" use="required" />
- <attribute name="oneWay" type="boolean" use="optional" />
- <anyAttribute namespace="##other" processContents="lax" />
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-java-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-java-1.1-schema-200803.xsd deleted file mode 100644 index 5dbdd0ca7d..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-java-1.1-schema-200803.xsd +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <!-- Java Interface -->
- <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
- <complexType name="JavaInterface">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="interface" type="NCName" use="required"/>
- <attribute name="callbackInterface" type="NCName" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-wsdl-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-wsdl-1.1-schema-200803.xsd deleted file mode 100644 index dad1f1a42a..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-interface-wsdl-1.1-schema-200803.xsd +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
-
- <!-- WSDL Interface -->
- <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
- <complexType name="WSDLPortType">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="interface" type="anyURI" use="required"/>
- <attribute name="callbackInterface" type="anyURI" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-policy-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-policy-1.1-schema-200803.xsd deleted file mode 100644 index 0d29fbae35..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/sca-policy-1.1-schema-200803.xsd +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
- OASIS trademark, IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- elementFormDefault="qualified">
-
- <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>
- <import namespace="http://www.w3.org/ns/ws-policy"
- schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
-
- <element name="intent" type="sca:Intent"/>
- <complexType name="Intent">
- <sequence>
- <element name="description" type="string" minOccurs="0"
- maxOccurs="1" />
- <element name="qualifier" type="sca:IntentQualifier"
- minOccurs="0" maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="constrains" type="sca:listOfQNames"
- use="optional"/>
- <attribute name="requires" type="sca:listOfQNames"
- use="optional"/>
- <attribute name="excludes" type="sca:listOfQNames"
- use="optional"/>
- <attribute name="mutuallyExclusive" type="boolean"
- use="optional" default="false"/>
- <attribute name="intentType"
- type="sca:InteractionOrImplementation"
- use="optional" default="interaction"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="IntentQualifier">
- <sequence>
- <element name="description" type="string" minOccurs="0"
- maxOccurs="1" />
- </sequence>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="default" type="boolean" use="optional"
- default="false"/>
- </complexType>
-
- <element name="policySet" type="sca:PolicySet"/>
- <complexType name="PolicySet">
- <choice minOccurs="0" maxOccurs="unbounded">
- <element name="policySetReference"
- type="sca:PolicySetReference"/>
- <element name="intentMap" type="sca:IntentMap"/>
- <any namespace="##other" processContents="lax"/>
- </choice>
- <attribute name="name" type="NCName" use="required"/>
- <attribute name="provides" type="sca:listOfQNames"/>
- <attribute name="appliesTo" type="string" use="required"/>
- <attribute name="attachTo" type="string" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <element name="policySetAttachment"
- type="sca:PolicySetAttachment"/>
- <complexType name="PolicySetAttachment">
- <attribute name="name" type="QName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="PolicySetReference">
- <attribute name="name" type="QName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="IntentMap">
- <choice minOccurs="1" maxOccurs="unbounded">
- <element name="qualifier" type="sca:Qualifier"/>
- <any namespace="##other" processContents="lax"/>
- </choice>
- <attribute name="provides" type="QName" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <complexType name="Qualifier">
- <choice minOccurs="1" maxOccurs="unbounded">
- <element name="intentMap" type="sca:IntentMap"/>
- <any namespace="##other" processContents="lax"/>
- </choice>
- <attribute name="name" type="string" use="required"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </complexType>
-
- <simpleType name="listOfNCNames">
- <list itemType="NCName"/>
- </simpleType>
-
- <simpleType name="InteractionOrImplementation">
- <restriction base="string">
- <enumeration value="interaction"/>
- <enumeration value="implementation"/>
- </restriction>
- </simpleType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd deleted file mode 100644 index e357e212d3..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd +++ /dev/null @@ -1,41 +0,0 @@ -<?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.1" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" - elementFormDefault="qualified"> - - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> - - <element name="binding.dwr" type="t:DWRBinding"/> - - <complexType name="DWRBinding"> - <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> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd deleted file mode 100644 index 19cd511ad3..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd +++ /dev/null @@ -1,41 +0,0 @@ -<?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.1" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" - elementFormDefault="qualified"> - - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> - - <element name="binding.http" type="t:HTTPBinding"/> - - <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> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd deleted file mode 100644 index 292ccfef34..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd +++ /dev/null @@ -1,41 +0,0 @@ -<?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.1" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" - elementFormDefault="qualified"> - - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> - - <element name="binding.jsonrpc" type="t:JSONRPCBinding"/> - - <complexType name="JSONRPCBinding"> - <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> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd deleted file mode 100644 index b008494c0f..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd +++ /dev/null @@ -1,40 +0,0 @@ -<?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.1" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" - elementFormDefault="qualified"> - - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> - - <element name="binding.rmi" type="t:RMIBinding"/> - - <complexType name="RMIBinding"> - <complexContent> - <extension base="sca:Binding"> - <sequence> - <any namespace="##targetNamespace" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - </extension> - </complexContent> - </complexType> -</schema> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd deleted file mode 100644 index 1b8bca1e30..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd +++ /dev/null @@ -1,43 +0,0 @@ -<?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.1" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" - elementFormDefault="qualified"> - - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> - - <element name="implementation.node" type="t:NodeImplementation"/> - - <complexType name="NodeImplementation"> - <complexContent> - <extension base="sca:Implementation"> - <sequence> - <any namespace="##targetNamespace" processContents="lax" - minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="uri" type="string" use="required"/> - <attribute name="composite" type="QName" use="required"/> - </extension> - </complexContent> - </complexType> - -</schema> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd deleted file mode 100644 index 79af5e9363..0000000000 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd +++ /dev/null @@ -1,34 +0,0 @@ -<?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> diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index 04fec252e4..81d7a927eb 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -34,6 +34,7 @@ <module>assembly-xml</module> <module>assembly-xml-osoa</module> <module>assembly-xsd</module> + <module>assembly-xsd-osoa</module> <module>binding-dwr</module> <module>binding-jsonp</module> <module>binding-jsonrpc</module> |