28 files changed, 346 insertions, 14 deletions

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