Delete old beta3 branch as its going to be recreated from the current trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151789 13f79535-47bb-0310-9956-ffa450edef68

55 files changed, 0 insertions, 5070 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/LICENSE b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/LICENSE
deleted file mode 100644
index 0bea130c88..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/LICENSE
+++ /dev/null
@@ -1,338 +0,0 @@
-
-                                 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 OASIS license:
-
-Copyright (C) OASIS(R) 2005, 2009. All Rights Reserved.
-All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual 
-Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.
-This document and translations of it may be copied and furnished to others, and derivative works that 
-comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, 
-and distributed, in whole or in part, without restriction of any kind, provided that the above copyright 
-notice and this section are included on all such copies and derivative works. However, this document 
-itself may not be modified in any way, including by removing the copyright notice or references to OASIS, 
-except as needed for the purpose of developing any document or deliverable produced by an OASIS 
-Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR 
-Policy, must be followed) or as required to translate it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors 
-or assigns.
-This document and the information contained herein is provided on an "AS IS" basis and OASIS 
-DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY 
-WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP 
-RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR 
-PURPOSE.
-OASIS requests that any OASIS Party or any other party that believes it has patent claims that would 
-necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, 
-to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to 
-such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that 
-produced this specification.
-OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of 
-any patent claims that would necessarily be infringed by implementations of this specification by a patent 
-holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR 
-Mode of the OASIS Technical Committee that produced this specification. OASIS may include such 
-claims on its website, but disclaims any obligation to do so.
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that 
-might be claimed to pertain to the implementation or use of the technology described in this document or 
-the extent to which any license under such rights might or might not be available; neither does it represent 
-that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to 
-rights in any document or deliverable produced by an OASIS Technical Committee can be found on the 
-OASIS website. Copies of claims of rights made available for publication and any assurances of licenses 
-to be made available, or the result of an attempt made to obtain a general license or permission for the use 
-of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS 
-Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any 
-information or list of intellectual property rights will at any time be complete, or that any claims in such list 
-are, in fact, Essential Claims.
-The names "OASIS",  are trademarks of OASIS, the owner and developer of this specification, and should 
-be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and 
-implementation and use of, specifications, while reserving the right to enforce its marks against misleading 
-uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
-
-===============================================================================
-
-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.
-
-=============================================================================== 
-
-This module includes XSD files under the following license:
-
-http://www.w3.org/Consortium/Legal/copyright-software-19980720
-
-W3C® SOFTWARE NOTICE AND LICENSE
-Copyright (c) 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche 
-en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, 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 use, 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, that you make:
-
-   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, a short 
-notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed 
-or derivative code: "Copyright (c) [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, 
-Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
-   3. Notice of any changes or modifications to the W3C 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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/META-INF/MANIFEST.MF
deleted file mode 100644
index ff93db6b14..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-SCA-Version: 1.1

-Bundle-Name: Apache Tuscany SCA Assembly Model XML Schemas

-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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Export-Package: org.apache.tuscany.sca.assembly.xsd;version="2.0.0"

-Import-Package: javax.xml.namespace

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/NOTICE b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/NOTICE
deleted file mode 100644
index 8d5d0a4770..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/NOTICE
+++ /dev/null
@@ -1,38 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2011 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 OASIS license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-Copyright (C) OASIS(R) 2005, 2009. All Rights Reserved.
-OASIS trademark, IPR and other policies apply.
-
-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
-
-This product also includes software under the W3C(c) Software License
-with the following copyright:
-
-Copyright 2001 The Internet Society and W3C (Massachusetts Institute
-of Technology, Institut National de Recherche en Informatique et en
-Automatique, Keio University). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-This document is governed by the W3C Software License [1] as described
-in the FAQ [2].
-
-[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/pom.xml b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/pom.xml
deleted file mode 100644
index 00b36ef02d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/pom.xml
+++ /dev/null
@@ -1,31 +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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta3-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-assembly-xsd</artifactId>
-    <name>Apache Tuscany SCA Assembly Model XSD Files</name>
-
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
deleted file mode 100644
index 6a42cdbd2e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.    
- */
-
-package org.apache.tuscany.sca.assembly.xsd;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-/**
- * Constants used in SCA assembly XML files.
- *
- * @version $Rev$ $Date$
- */
-public interface Constants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
-    String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
-    
-    String COMPONENT_TYPE = "componentType";
-    QName COMPONENT_TYPE_QNAME = new QName(SCA11_NS, COMPONENT_TYPE);
-    
-    String SERVICE = "service";
-    QName SERVICE_QNAME = new QName(SCA11_NS, SERVICE);
-    
-    String REFERENCE = "reference";
-    QName REFERENCE_QNAME = new QName(SCA11_NS, REFERENCE);
-    
-    String PROPERTY = "property";
-    QName PROPERTY_QNAME = new QName(SCA11_NS, PROPERTY);
-    
-    String COMPOSITE = "composite";
-    QName COMPOSITE_QNAME = new QName(SCA11_NS, COMPOSITE);
-    
-    String INCLUDE = "include";
-    QName INCLUDE_QNAME = new QName(SCA11_NS, INCLUDE); 
-    
-    String COMPONENT = "component";
-    QName COMPONENT_QNAME = new QName(SCA11_NS, COMPONENT);
-    
-    String WIRE = "wire";
-    QName WIRE_QNAME = new QName(SCA11_NS, WIRE);
-
-    String OPERATION = "operation";
-    QName OPERATION_QNAME = new QName(SCA11_NS, OPERATION);
-    
-    String CALLBACK = "callback";
-    QName CALLBACK_QNAME = new QName(SCA11_NS, CALLBACK);
-
-    String IMPLEMENTATION_COMPOSITE = "implementation.composite";
-    QName IMPLEMENTATION_COMPOSITE_QNAME = new QName(SCA11_NS, IMPLEMENTATION_COMPOSITE);
-    
-    String IMPLEMENTATION = "implementation";
-    QName IMPLEMENTATION_QNAME = new QName(SCA11_NS, IMPLEMENTATION);
-    
-    String BINDING_SCA = "binding.sca";
-    QName BINDING_SCA_QNAME = new QName(Constants.SCA11_NS, BINDING_SCA);
-    
-    String NAME = "name";
-    String VALUE = "value";
-    QName VALUE_QNAME = new QName(SCA11_NS, VALUE);    
-    String TARGET_NAMESPACE = "targetNamespace";
-    String LOCAL = "local";
-    String AUTOWIRE = "autowire";
-    String NONOVERRIDABLE = "nonOverridable";
-    String REPLACE = "replace";
-    String REQUIRES = "requires";
-    String POLICY_SETS = "policySets"; 
-    String APPLICABLE_POLICY_SETS = "applicablePolicySets";
-    String PROMOTE = "promote";
-    String TARGET = "target";
-    String WIRED_BY_IMPL = "wiredByImpl";
-    String MULTIPLICITY = "multiplicity";
-    String TYPE = "type";
-    String ELEMENT = "element";
-    String MANY = "many";
-    String MUST_SUPPLY = "mustSupply";
-    String SOURCE = "source";
-    String FILE = "file";
-    String URI = "uri";
-    String ZERO_ONE = "0..1";
-    String ZERO_N = "0..n";
-    String ONE_ONE = "1..1";
-    String ONE_N = "1..n";
-    
-    /**
-     * Cache for public XSDs and DTDs
-     */
-    Map<String, URL> CACHED_XSDS = XSDCache.cache();
-
-    static class XSDCache {
-        static Map<String, URL> cache() {
-            Map<String, URL> cachedXSDs = new HashMap<String, URL>();
-            cachedXSDs.put(Constants.SCA11_NS, Constants.class.getResource("/sca-1.1-cd06.xsd"));
-            cachedXSDs
-                .put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd",
-                     Constants.class
-                         .getResource("/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd"));
-            cachedXSDs
-                .put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd",
-                     Constants.class
-                         .getResource("/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd"));
-            cachedXSDs.put("http://www.w3.org/2005/08/addressing", Constants.class
-                .getResource("/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd"));
-            cachedXSDs.put("http://www.w3.org/ns/ws-policy", Constants.class
-                .getResource("/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd"));
-            cachedXSDs.put("http://www.w3.org/ns/wsdl-instance", Constants.class
-                .getResource("/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd"));
-            cachedXSDs.put("http://www.w3.org/XML/1998/namespace", Constants.class
-                .getResource("/org/apache/tuscany/sca/assembly/xsd/xml.xsd"));
-            cachedXSDs.put("http://www.w3.org/2000/09/xmldsig#", Constants.class
-                .getResource("/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd"));
-
-            cachedXSDs.put("-//W3C//DTD XMLSchema 200102//EN", Constants.class
-                           .getResource("/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd"));
-            cachedXSDs.put("-//W3C//DTD XMLSCHEMA 200102//EN", Constants.class
-                .getResource("/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd"));
-            cachedXSDs.put("datatypes", Constants.class
-                .getResource("/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd"));
-            return cachedXSDs;
-        }
-    };
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index 863d161954..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-1.1.xsd
-sca-1.1-cd06.xsd

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
deleted file mode 100644
index e8e8f7625a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
+++ /dev/null
@@ -1,402 +0,0 @@
-<!-- DTD for XML Schemas: Part 1: Structures
-     Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
-     Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
-<!-- $Id: XMLSchema.dtd,v 1.31 2001/10/24 15:50:16 ht Exp $ -->
-<!-- Note this DTD is NOT normative, or even definitive. -->           <!--d-->
-<!-- prose copy in the structures REC is the definitive version -->    <!--d-->
-<!-- (which shouldn't differ from this one except for this -->         <!--d-->
-<!-- comment and entity expansions, but just in case) -->              <!--d-->
-<!-- With the exception of cases with multiple namespace
-     prefixes for the XML Schema namespace, any XML document which is
-     not valid per this DTD given redefinitions in its internal subset of the
-     'p' and 's' parameter entities below appropriate to its namespace
-     declaration of the XML Schema namespace is almost certainly not
-     a valid schema. -->
-
-<!-- The simpleType element and its constituent parts
-     are defined in XML Schema: Part 2: Datatypes -->
-<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
-
-<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
-                         schema document to establish a different
-                         namespace prefix -->
-<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
-                         also define %s as the suffix for the appropriate
-                         namespace declaration (e.g. :foo) -->
-<!ENTITY % nds 'xmlns%s;'>
-
-<!-- Define all the element names, with optional prefix -->
-<!ENTITY % schema "%p;schema">
-<!ENTITY % complexType "%p;complexType">
-<!ENTITY % complexContent "%p;complexContent">
-<!ENTITY % simpleContent "%p;simpleContent">
-<!ENTITY % extension "%p;extension">
-<!ENTITY % element "%p;element">
-<!ENTITY % unique "%p;unique">
-<!ENTITY % key "%p;key">
-<!ENTITY % keyref "%p;keyref">
-<!ENTITY % selector "%p;selector">
-<!ENTITY % field "%p;field">
-<!ENTITY % group "%p;group">
-<!ENTITY % all "%p;all">
-<!ENTITY % choice "%p;choice">
-<!ENTITY % sequence "%p;sequence">
-<!ENTITY % any "%p;any">
-<!ENTITY % anyAttribute "%p;anyAttribute">
-<!ENTITY % attribute "%p;attribute">
-<!ENTITY % attributeGroup "%p;attributeGroup">
-<!ENTITY % include "%p;include">
-<!ENTITY % import "%p;import">
-<!ENTITY % redefine "%p;redefine">
-<!ENTITY % notation "%p;notation">
-
-<!-- annotation elements -->
-<!ENTITY % annotation "%p;annotation">
-<!ENTITY % appinfo "%p;appinfo">
-<!ENTITY % documentation "%p;documentation">
-
-<!-- Customisation entities for the ATTLIST of each element type.
-     Define one of these if your schema takes advantage of the
-     anyAttribute='##other' in the schema for schemas -->
-
-<!ENTITY % schemaAttrs ''>
-<!ENTITY % complexTypeAttrs ''>
-<!ENTITY % complexContentAttrs ''>
-<!ENTITY % simpleContentAttrs ''>
-<!ENTITY % extensionAttrs ''>
-<!ENTITY % elementAttrs ''>
-<!ENTITY % groupAttrs ''>
-<!ENTITY % allAttrs ''>
-<!ENTITY % choiceAttrs ''>
-<!ENTITY % sequenceAttrs ''>
-<!ENTITY % anyAttrs ''>
-<!ENTITY % anyAttributeAttrs ''>
-<!ENTITY % attributeAttrs ''>
-<!ENTITY % attributeGroupAttrs ''>
-<!ENTITY % uniqueAttrs ''>
-<!ENTITY % keyAttrs ''>
-<!ENTITY % keyrefAttrs ''>
-<!ENTITY % selectorAttrs ''>
-<!ENTITY % fieldAttrs ''>
-<!ENTITY % includeAttrs ''>
-<!ENTITY % importAttrs ''>
-<!ENTITY % redefineAttrs ''>
-<!ENTITY % notationAttrs ''>
-<!ENTITY % annotationAttrs ''>
-<!ENTITY % appinfoAttrs ''>
-<!ENTITY % documentationAttrs ''>
-
-<!ENTITY % complexDerivationSet "CDATA">
-      <!-- #all or space-separated list drawn from derivationChoice -->
-<!ENTITY % blockSet "CDATA">
-      <!-- #all or space-separated list drawn from
-                      derivationChoice + 'substitution' -->
-
-<!ENTITY % mgs '%all; | %choice; | %sequence;'>
-<!ENTITY % cs '%choice; | %sequence;'>
-<!ENTITY % formValues '(qualified|unqualified)'>
-
-
-<!ENTITY % attrDecls    '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
-
-<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
-
-<!-- This is used in part2 -->
-<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
-
-%xs-datatypes;
-
-<!-- the duplication below is to produce an unambiguous content model
-     which allows annotation everywhere -->
-<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
-                    ((%simpleType; | %complexType;
-                      | %element; | %attribute;
-                      | %attributeGroup; | %group;
-                      | %notation; ),
-                     (%annotation;)*)* )>
-<!ATTLIST %schema;
-   targetNamespace      %URIref;               #IMPLIED
-   version              CDATA                  #IMPLIED
-   %nds;                %URIref;               #FIXED 'http://www.w3.org/2001/XMLSchema'
-   xmlns                CDATA                  #IMPLIED
-   finalDefault         %complexDerivationSet; ''
-   blockDefault         %blockSet;             ''
-   id                   ID                     #IMPLIED
-   elementFormDefault   %formValues;           'unqualified'
-   attributeFormDefault %formValues;           'unqualified'
-   xml:lang             CDATA                  #IMPLIED
-   %schemaAttrs;>
-<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
-     because at the Infoset level where schemas operate,
-     xmlns(:prefix) is NOT an attribute! -->
-<!-- The declaration of xmlns is a convenience for schema authors -->
- 
-<!-- The id attribute here and below is for use in external references
-     from non-schemas using simple fragment identifiers.
-     It is NOT used for schema-to-schema reference, internal or
-     external. -->
-
-<!-- a type is a named content type specification which allows attribute
-     declarations-->
-<!-- -->
-
-<!ELEMENT %complexType; ((%annotation;)?,
-                         (%simpleContent;|%complexContent;|
-                          %particleAndAttrs;))>
-
-<!ATTLIST %complexType;
-          name      %NCName;                        #IMPLIED
-          id        ID                              #IMPLIED
-          abstract  %boolean;                       #IMPLIED
-          final     %complexDerivationSet;          #IMPLIED
-          block     %complexDerivationSet;          #IMPLIED
-          mixed (true|false) 'false'
-          %complexTypeAttrs;>
-
-<!-- particleAndAttrs is shorthand for a root type -->
-<!-- mixed is disallowed if simpleContent, overriden if complexContent
-     has one too. -->
-
-<!-- If anyAttribute appears in one or more referenced attributeGroups
-     and/or explicitly, the intersection of the permissions is used -->
-
-<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %complexContent;
-          mixed (true|false) #IMPLIED
-          id    ID           #IMPLIED
-          %complexContentAttrs;>
-
-<!-- restriction should use the branch defined above, not the simple
-     one from part2; extension should use the full model  -->
-
-<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %simpleContent;
-          id    ID           #IMPLIED
-          %simpleContentAttrs;>
-
-<!-- restriction should use the simple branch from part2, not the 
-     one defined above; extension should have no particle  -->
-
-<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
-<!ATTLIST %extension;
-          base  %QName;      #REQUIRED
-          id    ID           #IMPLIED
-          %extensionAttrs;>
-
-<!-- an element is declared by either:
- a name and a type (either nested or referenced via the type attribute)
- or a ref to an existing element declaration -->
-
-<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
-                     (%unique; | %key; | %keyref;)*)>
-<!-- simpleType or complexType only if no type|ref attribute -->
-<!-- ref not allowed at top level -->
-<!ATTLIST %element;
-            name               %NCName;               #IMPLIED
-            id                 ID                     #IMPLIED
-            ref                %QName;                #IMPLIED
-            type               %QName;                #IMPLIED
-            minOccurs          %nonNegativeInteger;   #IMPLIED
-            maxOccurs          CDATA                  #IMPLIED
-            nillable           %boolean;              #IMPLIED
-            substitutionGroup  %QName;                #IMPLIED
-            abstract           %boolean;              #IMPLIED
-            final              %complexDerivationSet; #IMPLIED
-            block              %blockSet;             #IMPLIED
-            default            CDATA                  #IMPLIED
-            fixed              CDATA                  #IMPLIED
-            form               %formValues;           #IMPLIED
-            %elementAttrs;>
-<!-- type and ref are mutually exclusive.
-     name and ref are mutually exclusive, one is required -->
-<!-- In the absence of type AND ref, type defaults to type of
-     substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
-<!-- default and fixed are mutually exclusive -->
-
-<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
-<!ATTLIST %group; 
-          name        %NCName;               #IMPLIED
-          ref         %QName;                #IMPLIED
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %groupAttrs;>
-
-<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
-<!ATTLIST %all;
-          minOccurs   (1)                    #IMPLIED
-          maxOccurs   (1)                    #IMPLIED
-          id          ID                     #IMPLIED
-          %allAttrs;>
-
-<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %choice;
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %choiceAttrs;>
-
-<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %sequence;
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %sequenceAttrs;>
-
-<!-- an anonymous grouping in a model, or
-     a top-level named group definition, or a reference to same -->
-
-<!-- Note that if order is 'all', group is not allowed inside.
-     If order is 'all' THIS group must be alone (or referenced alone) at
-     the top level of a content model -->
-<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
-<!-- Should allow minOccurs=0 inside order='all' . . . -->
-
-<!ELEMENT %any; (%annotation;)?>
-<!ATTLIST %any;
-            namespace       CDATA                  '##any'
-            processContents (skip|lax|strict)      'strict'
-            minOccurs       %nonNegativeInteger;   '1'
-            maxOccurs       CDATA                  '1'
-            id              ID                     #IMPLIED
-            %anyAttrs;>
-
-<!-- namespace is interpreted as follows:
-                  ##any      - - any non-conflicting WFXML at all
-
-                  ##other    - - any non-conflicting WFXML from namespace other
-                                  than targetNamespace
-
-                  ##local    - - any unqualified non-conflicting WFXML/attribute
-                  one or     - - any non-conflicting WFXML from
-                  more URI        the listed namespaces
-                  references
-
-                  ##targetNamespace ##local may appear in the above list,
-                    with the obvious meaning -->
-
-<!ELEMENT %anyAttribute; (%annotation;)?>
-<!ATTLIST %anyAttribute;
-            namespace       CDATA              '##any'
-            processContents (skip|lax|strict)  'strict'
-            id              ID                 #IMPLIED
-            %anyAttributeAttrs;>
-<!-- namespace is interpreted as for 'any' above -->
-
-<!-- simpleType only if no type|ref attribute -->
-<!-- ref not allowed at top level, name iff at top level -->
-<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
-<!ATTLIST %attribute;
-          name      %NCName;      #IMPLIED
-          id        ID            #IMPLIED
-          ref       %QName;       #IMPLIED
-          type      %QName;       #IMPLIED
-          use       (prohibited|optional|required) #IMPLIED
-          default   CDATA         #IMPLIED
-          fixed     CDATA         #IMPLIED
-          form      %formValues;  #IMPLIED
-          %attributeAttrs;>
-<!-- type and ref are mutually exclusive.
-     name and ref are mutually exclusive, one is required -->
-<!-- default for use is optional when nested, none otherwise -->
-<!-- default and fixed are mutually exclusive -->
-<!-- type attr and simpleType content are mutually exclusive -->
-
-<!-- an attributeGroup is a named collection of attribute decls, or a
-     reference thereto -->
-<!ELEMENT %attributeGroup; ((%annotation;)?,
-                       (%attribute; | %attributeGroup;)*,
-                       (%anyAttribute;)?) >
-<!ATTLIST %attributeGroup;
-                 name       %NCName;       #IMPLIED
-                 id         ID             #IMPLIED
-                 ref        %QName;        #IMPLIED
-                 %attributeGroupAttrs;>
-
-<!-- ref iff no content, no name.  ref iff not top level -->
-
-<!-- better reference mechanisms -->
-<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %unique;
-          name     %NCName;       #REQUIRED
-	  id       ID             #IMPLIED
-	  %uniqueAttrs;>
-
-<!ELEMENT %key;    ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %key;
-          name     %NCName;       #REQUIRED
-	  id       ID             #IMPLIED
-	  %keyAttrs;>
-
-<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %keyref;
-          name     %NCName;       #REQUIRED
-	  refer    %QName;        #REQUIRED
-	  id       ID             #IMPLIED
-	  %keyrefAttrs;>
-
-<!ELEMENT %selector; ((%annotation;)?)>
-<!ATTLIST %selector;
-          xpath %XPathExpr; #REQUIRED
-          id    ID          #IMPLIED
-          %selectorAttrs;>
-<!ELEMENT %field; ((%annotation;)?)>
-<!ATTLIST %field;
-          xpath %XPathExpr; #REQUIRED
-          id    ID          #IMPLIED
-          %fieldAttrs;>
-
-<!-- Schema combination mechanisms -->
-<!ELEMENT %include; (%annotation;)?>
-<!ATTLIST %include;
-          schemaLocation %URIref; #REQUIRED
-          id             ID       #IMPLIED
-          %includeAttrs;>
-
-<!ELEMENT %import; (%annotation;)?>
-<!ATTLIST %import;
-          namespace      %URIref; #IMPLIED
-          schemaLocation %URIref; #IMPLIED
-          id             ID       #IMPLIED
-          %importAttrs;>
-
-<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
-                      %attributeGroup; | %group;)*>
-<!ATTLIST %redefine;
-          schemaLocation %URIref; #REQUIRED
-          id             ID       #IMPLIED
-          %redefineAttrs;>
-
-<!ELEMENT %notation; (%annotation;)?>
-<!ATTLIST %notation;
-	  name        %NCName;    #REQUIRED
-	  id          ID          #IMPLIED
-	  public      CDATA       #REQUIRED
-	  system      %URIref;    #IMPLIED
-	  %notationAttrs;>
-
-<!-- Annotation is either application information or documentation -->
-<!-- By having these here they are available for datatypes as well
-     as all the structures elements -->
-
-<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
-<!ATTLIST %annotation; %annotationAttrs;>
-
-<!-- User must define annotation elements in internal subset for this
-     to work -->
-<!ELEMENT %appinfo; ANY>   <!-- too restrictive -->
-<!ATTLIST %appinfo;
-          source     %URIref;      #IMPLIED
-          id         ID         #IMPLIED
-          %appinfoAttrs;>
-<!ELEMENT %documentation; ANY>   <!-- too restrictive -->
-<!ATTLIST %documentation;
-          source     %URIref;   #IMPLIED
-          id         ID         #IMPLIED
-          xml:lang   CDATA      #IMPLIED
-          %documentationAttrs;>
-
-<!NOTATION XMLSchemaStructures PUBLIC
-           'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
-<!NOTATION XML PUBLIC
-           'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
deleted file mode 100644
index 685e89a57e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
+++ /dev/null
@@ -1,204 +0,0 @@
-<!--

-        DTD for XML Schemas: Part 2: Datatypes

-        $Id: datatypes.dtd,v 1.23 2001/03/16 17:36:30 ht Exp $

-        Note this DTD is NOT normative, or even definitive. - - the

-        prose copy in the datatypes REC is the definitive version

-        (which shouldn't differ from this one except for this comment

-        and entity expansions, but just in case)

-  -->

-

-<!--

-        This DTD cannot be used on its own, it is intended

-        only for incorporation in XMLSchema.dtd, q.v.

-  -->

-

-<!-- Define all the element names, with optional prefix -->

-<!ENTITY % simpleType "%p;simpleType">

-<!ENTITY % restriction "%p;restriction">

-<!ENTITY % list "%p;list">

-<!ENTITY % union "%p;union">

-<!ENTITY % maxExclusive "%p;maxExclusive">

-<!ENTITY % minExclusive "%p;minExclusive">

-<!ENTITY % maxInclusive "%p;maxInclusive">

-<!ENTITY % minInclusive "%p;minInclusive">

-<!ENTITY % totalDigits "%p;totalDigits">

-<!ENTITY % fractionDigits "%p;fractionDigits">

-<!ENTITY % length "%p;length">

-<!ENTITY % minLength "%p;minLength">

-<!ENTITY % maxLength "%p;maxLength">

-<!ENTITY % enumeration "%p;enumeration">

-<!ENTITY % whiteSpace "%p;whiteSpace">

-<!ENTITY % pattern "%p;pattern">

-

-<!--

-        Customisation entities for the ATTLIST of each element

-        type. Define one of these if your schema takes advantage

-        of the anyAttribute='##other' in the schema for schemas

-  -->

-

-<!ENTITY % simpleTypeAttrs "">

-<!ENTITY % restrictionAttrs "">

-<!ENTITY % listAttrs "">

-<!ENTITY % unionAttrs "">

-<!ENTITY % maxExclusiveAttrs "">

-<!ENTITY % minExclusiveAttrs "">

-<!ENTITY % maxInclusiveAttrs "">

-<!ENTITY % minInclusiveAttrs "">

-<!ENTITY % totalDigitsAttrs "">

-<!ENTITY % fractionDigitsAttrs "">

-<!ENTITY % lengthAttrs "">

-<!ENTITY % minLengthAttrs "">

-<!ENTITY % maxLengthAttrs "">

-<!ENTITY % enumerationAttrs "">

-<!ENTITY % whiteSpaceAttrs "">

-<!ENTITY % patternAttrs "">

-

-<!-- Define some entities for informative use as attribute

-        types -->

-<!ENTITY % URIref "CDATA">

-<!ENTITY % XPathExpr "CDATA">

-<!ENTITY % QName "NMTOKEN">

-<!ENTITY % QNames "NMTOKENS">

-<!ENTITY % NCName "NMTOKEN">

-<!ENTITY % nonNegativeInteger "NMTOKEN">

-<!ENTITY % boolean "(true|false)">

-<!ENTITY % simpleDerivationSet "CDATA">

-<!--

-        #all or space-separated list drawn from derivationChoice

-  -->

-

-<!--

-        Note that the use of 'facet' below is less restrictive

-        than is really intended:  There should in fact be no

-        more than one of each of minInclusive, minExclusive,

-        maxInclusive, maxExclusive, totalDigits, fractionDigits,

-        length, maxLength, minLength within datatype,

-        and the min- and max- variants of Inclusive and Exclusive

-        are mutually exclusive. On the other hand,  pattern and

-        enumeration may repeat.

-  -->

-<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">

-<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">

-<!ENTITY % bounds "%minBound; | %maxBound;">

-<!ENTITY % numeric "%totalDigits; | %fractionDigits;">

-<!ENTITY % ordered "%bounds; | %numeric;">

-<!ENTITY % unordered

-   "%pattern; | %enumeration; | %whiteSpace; | %length; |

-   %maxLength; | %minLength;">

-<!ENTITY % facet "%ordered; | %unordered;">

-<!ENTITY % facetAttr

-        "value CDATA #REQUIRED

-        id ID #IMPLIED">

-<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">

-<!ENTITY % facetModel "(%annotation;)?">

-<!ELEMENT %simpleType;

-        ((%annotation;)?, (%restriction; | %list; | %union;))>

-<!ATTLIST %simpleType;

-    name      %NCName; #IMPLIED

-    final     %simpleDerivationSet; #IMPLIED

-    id        ID       #IMPLIED

-    %simpleTypeAttrs;>

-<!-- name is required at top level -->

-<!ELEMENT %restriction; ((%annotation;)?,

-                         (%restriction1; |

-                          ((%simpleType;)?,(%facet;)*)),

-                         (%attrDecls;))>

-<!ATTLIST %restriction;

-    base      %QName;                  #IMPLIED

-    id        ID       #IMPLIED

-    %restrictionAttrs;>

-<!--

-        base and simpleType child are mutually exclusive,

-        one is required.

-

-        restriction is shared between simpleType and

-        simpleContent and complexContent (in XMLSchema.xsd).

-        restriction1 is for the latter cases, when this

-        is restricting a complex type, as is attrDecls.

-  -->

-<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>

-<!ATTLIST %list;

-    itemType      %QName;             #IMPLIED

-    id        ID       #IMPLIED

-    %listAttrs;>

-<!--

-        itemType and simpleType child are mutually exclusive,

-        one is required

-  -->

-<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>

-<!ATTLIST %union;

-    id            ID       #IMPLIED

-    memberTypes   %QNames;            #IMPLIED

-    %unionAttrs;>

-<!--

-        At least one item in memberTypes or one simpleType

-        child is required

-  -->

-

-<!ELEMENT %maxExclusive; %facetModel;>

-<!ATTLIST %maxExclusive;

-        %facetAttr;

-        %fixedAttr;

-        %maxExclusiveAttrs;>

-<!ELEMENT %minExclusive; %facetModel;>

-<!ATTLIST %minExclusive;

-        %facetAttr;

-        %fixedAttr;

-        %minExclusiveAttrs;>

-

-<!ELEMENT %maxInclusive; %facetModel;>

-<!ATTLIST %maxInclusive;

-        %facetAttr;

-        %fixedAttr;

-        %maxInclusiveAttrs;>

-<!ELEMENT %minInclusive; %facetModel;>

-<!ATTLIST %minInclusive;

-        %facetAttr;

-        %fixedAttr;

-        %minInclusiveAttrs;>

-

-<!ELEMENT %totalDigits; %facetModel;>

-<!ATTLIST %totalDigits;

-        %facetAttr;

-        %fixedAttr;

-        %totalDigitsAttrs;>

-<!ELEMENT %fractionDigits; %facetModel;>

-<!ATTLIST %fractionDigits;

-        %facetAttr;

-        %fixedAttr;

-        %fractionDigitsAttrs;>

-

-<!ELEMENT %length; %facetModel;>

-<!ATTLIST %length;

-        %facetAttr;

-        %fixedAttr;

-        %lengthAttrs;>

-<!ELEMENT %minLength; %facetModel;>

-<!ATTLIST %minLength;

-        %facetAttr;

-        %fixedAttr;

-        %minLengthAttrs;>

-<!ELEMENT %maxLength; %facetModel;>

-<!ATTLIST %maxLength;

-        %facetAttr;

-        %fixedAttr;

-        %maxLengthAttrs;>

-

-<!-- This one can be repeated -->

-<!ELEMENT %enumeration; %facetModel;>

-<!ATTLIST %enumeration;

-        %facetAttr;

-        %enumerationAttrs;>

-

-<!ELEMENT %whiteSpace; %facetModel;>

-<!ATTLIST %whiteSpace;

-        %facetAttr;

-        %fixedAttr;

-        %whiteSpaceAttrs;>

-

-<!-- This one can be repeated -->

-<!ELEMENT %pattern; %facetModel;>

-<!ATTLIST %pattern;

-        %facetAttr;

-        %patternAttrs;>

-

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
deleted file mode 100644
index 641798b17f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ /dev/null
@@ -1,195 +0,0 @@
-ļ»æ<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright Ā© OASIS Open 2002-2004. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an ā€œAS ISā€ basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--->
-<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2">
-	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-	<xsd:complexType name="AttributedString">
-		<xsd:annotation>
-			<xsd:documentation>This type represents an element with arbitrary attributes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute ref="wsu:Id"/>
-				<xsd:anyAttribute namespace="##other" processContents="lax"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="PasswordString">
-		<xsd:annotation>
-			<xsd:documentation>This type is used for password elements per Section 4.1.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:AttributedString">
-				<xsd:attribute name="Type" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="EncodedString">
-		<xsd:annotation>
-			<xsd:documentation>This type is used for elements containing stringified binary data.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:AttributedString">
-				<xsd:attribute name="EncodingType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="UsernameTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a username token per Section 4.1</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="Username" type="wsse:AttributedString"/>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute ref="wsu:Id"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="BinarySecurityTokenType">
-		<xsd:annotation>
-			<xsd:documentation>A security token that is encoded in binary</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:EncodedString">
-				<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="KeyIdentifierType">
-		<xsd:annotation>
-			<xsd:documentation>A security token key identifier</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:EncodedString">
-				<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="tUsage">
-		<xsd:annotation>
-			<xsd:documentation>Typedef to allow a list of usages (as URIs).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:list itemType="xsd:anyURI"/>
-	</xsd:simpleType>
-	<xsd:attribute name="Usage" type="tUsage">
-		<xsd:annotation>
-			<xsd:documentation>This global attribute is used to indicate the usage of a referenced or indicated token within the containing context</xsd:documentation>
-		</xsd:annotation>
-	</xsd:attribute>
-	<xsd:complexType name="ReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a reference to an external security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="URI" type="xsd:anyURI"/>
-		<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="EmbeddedType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a reference to an embedded security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:any processContents="lax"/>
-		</xsd:choice>
-		<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="SecurityTokenReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This type is used reference a security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:any processContents="lax"/>
-		</xsd:choice>
-		<xsd:attribute ref="wsu:Id"/>
-		<xsd:attribute ref="wsse:Usage"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="SecurityHeaderType">
-		<xsd:annotation>
-			<xsd:documentation>This complexType defines header block to use for security-relevant data directed at a specific SOAP actor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation>The use of "any" is to allow extensibility and different forms of security data.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:any>
-		</xsd:sequence>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="TransformationParametersType">
-		<xsd:annotation>
-			<xsd:documentation>This complexType defines a container for elements to be specified from any namespace as properties/parameters of a DSIG transformation.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation>The use of "any" is to allow extensibility from any namespace.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:any>
-		</xsd:sequence>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:element name="UsernameToken" type="wsse:UsernameTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:UsernameToken element per Section 4.1.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="BinarySecurityToken" type="wsse:BinarySecurityTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:BinarySecurityToken element per Section 4.2.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Reference" type="wsse:ReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a security token reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Embedded" type="wsse:EmbeddedType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a security token embedded reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="KeyIdentifier" type="wsse:KeyIdentifierType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a key identifier reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="SecurityTokenReference" type="wsse:SecurityTokenReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:SecurityTokenReference per Section 4.3.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Security" type="wsse:SecurityHeaderType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:Security SOAP header element per Section 4.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="TransformationParameters" type="wsse:TransformationParametersType">
-		<xsd:annotation>
-			<xsd:documentation>This element contains properties for transformations from any namespace, including DSIG.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Password" type="wsse:PasswordString"/>
-	<xsd:element name="Nonce" type="wsse:EncodedString"/>
-	<xsd:simpleType name="FaultcodeEnum">
-		<xsd:restriction base="xsd:QName">
-			<xsd:enumeration value="wsse:UnsupportedSecurityToken"/>
-			<xsd:enumeration value="wsse:UnsupportedAlgorithm"/>
-			<xsd:enumeration value="wsse:InvalidSecurity"/>
-			<xsd:enumeration value="wsse:InvalidSecurityToken"/>
-			<xsd:enumeration value="wsse:FailedAuthentication"/>
-			<xsd:enumeration value="wsse:FailedCheck"/>
-			<xsd:enumeration value="wsse:SecurityTokenUnavailable"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-</xsd:schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
deleted file mode 100644
index f8d74e9c6e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ /dev/null
@@ -1,108 +0,0 @@
-ļ»æ<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright Ā© OASIS Open 2002-2004. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an ā€œAS ISā€ basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--->
-<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-
-
-
-xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
-elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
-	<!-- // Fault Codes /////////////////////////////////////////// -->
-	<xsd:simpleType name="tTimestampFault">
-		<xsd:annotation>
-			<xsd:documentation>
-This type defines the fault code value for Timestamp message expiration.
-          </xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:QName">
-			<xsd:enumeration value="wsu:MessageExpired"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<!-- // Global attributes //////////////////////////////////// -->
-	<xsd:attribute name="Id" type="xsd:ID">
-		<xsd:annotation>
-			<xsd:documentation>
-This global attribute supports annotating arbitrary elements with an ID.
-          </xsd:documentation>
-		</xsd:annotation>
-	</xsd:attribute>
-	<xsd:attributeGroup name="commonAtts">
-		<xsd:annotation>
-			<xsd:documentation>
-Convenience attribute group used to simplify this schema.
-          </xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute ref="wsu:Id" use="optional"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:attributeGroup>
-	<!-- // Utility types //////////////////////////////////////// -->
-	<xsd:complexType name="AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. 
-      </xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attributeGroup ref="wsu:commonAtts"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="AttributedURI">
-		<xsd:annotation>
-			<xsd:documentation>
-This type is for elements whose [children] is an anyURI and can have arbitrary attributes.
-      </xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:anyURI">
-				<xsd:attributeGroup ref="wsu:commonAtts"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<!-- // Timestamp header components /////////////////////////// -->
-	<xsd:complexType name="TimestampType">
-		<xsd:annotation>
-			<xsd:documentation>
-This complex type ties together the timestamp related elements into a composite type.
-            </xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element ref="wsu:Created" minOccurs="0"/>
-			<xsd:element ref="wsu:Expires" minOccurs="0"/>
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:any namespace="##other" processContents="lax"/>
-			</xsd:choice>
-		</xsd:sequence>
-		<xsd:attributeGroup ref="wsu:commonAtts"/>
-	</xsd:complexType>
-	<xsd:element name="Timestamp" type="wsu:TimestampType">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows Timestamps to be applied anywhere element wildcards are present,
-including as a SOAP header.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<!-- global element decls to allow individual elements to appear anywhere -->
-	<xsd:element name="Expires" type="wsu:AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows an expiration time to be applied anywhere element wildcards are present.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Created" type="wsu:AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows a creation time to be applied anywhere element wildcards are present.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-</xsd:schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/sca-spring-extension-csd01.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/sca-spring-extension-csd01.xsd
deleted file mode 100644
index 2d8d25a2a5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/sca-spring-extension-csd01.xsd
+++ /dev/null
@@ -1,66 +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.  -->
-<xsd:schema 
-  xmlns="http://docs.oasis-open.org/ns/opencsa/sca-j/spring/200810"  
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-  xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912
-                      http://docs.oasis-open.org/opencsa/sca-assembly/sca-core-1.1-cd06.xsd" 
-  attributeFormDefault="unqualified" 
-  elementFormDefault="qualified" 
-  targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca-j/spring/200810">
-   
-	<xsd:element name="reference">
-		<xsd:complexType>
-                  <any namespace="##other" processContents="lax"  
-                        minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:attribute name="name" type="xsd:NCName" 
-				use="required"/>
-			<xsd:attribute name="type" type="xsd:NCName" 
-				use="required"/>
-			<xsd:attribute name="default" type="xsd:NCName" 
-				use="optional"/>
-			<xsd:attribute name="requires" type="sca:listOfQNames" 
-				use="optional"/>
-            	<xsd:attribute name="policySets" type="sca:listOfQNames" 
-            		use="optional"/>
-                  <xsd:anyAttribute namespace="##other" processContents="lax"    
-                        use="optional"/>	
-		</xsd:complexType>		
-	</xsd:element>
-
-	<xsd:element name="property">
-		<xsd:complexType>
-                  <any namespace="##other" processContents="lax" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:attribute name="name" type="xsd:NCName" 
-				use="required"/>
-			<xsd:attribute name="type" type="xsd:NCName" 
-				use="required"/>
-                  <xsd:anyAttribute namespace="##other" processContents="lax"    
-                        use="optional"/>	
-		</xsd:complexType>		
-	</xsd:element>
-
-	<xsd:element name="service">
-		<xsd:complexType>
-                  <any namespace="##other" processContents="lax" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:attribute name="name" type="xsd:NCName" 
-				use="required"/>
-			<xsd:attribute name="type" type="xsd:NCName" 
-				use="optional"/>
-			<xsd:attribute name="target" type="xsd:NCName" 
-				use="required"/>
-			<xsd:attribute name="requires" type="sca:listOfQNames" 
-				use="optional"/>
-            	<xsd:attribute name="policySets" type="sca:listOfQNames" 
-            		use="optional"/>
-                  <xsd:anyAttribute namespace="##other" processContents="lax"    
-                        use="optional"/>	
-		</xsd:complexType>		
-	</xsd:element>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
deleted file mode 100644
index f6fc9c53b0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    W3C XML Schema defined in the Web Services Addressing 1.0 specification
-    http://www.w3.org/TR/ws-addr-core
-
-   Copyright Ā© 2005 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Ā® 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
-
-   $Id: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">
-
-    <!-- Constructs from the WS-Addressing Core -->
-
-    <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
-    <xs:complexType name="EndpointReferenceType" mixed="false">
-        <xs:sequence>
-            <xs:element name="Address" type="tns:AttributedURIType"/>
-            <xs:element ref="tns:ReferenceParameters" minOccurs="0"/>
-            <xs:element ref="tns:Metadata" minOccurs="0"/>
-            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:complexType>
-
-    <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/>
-    <xs:complexType name="ReferenceParametersType" mixed="false">
-        <xs:sequence>
-            <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:complexType>
-
-    <xs:element name="Metadata" type="tns:MetadataType"/>
-    <xs:complexType name="MetadataType" mixed="false">
-        <xs:sequence>
-            <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:complexType>
-
-    <xs:element name="MessageID" type="tns:AttributedURIType"/>
-    <xs:element name="RelatesTo" type="tns:RelatesToType"/>
-    <xs:complexType name="RelatesToType" mixed="false">
-        <xs:simpleContent>
-            <xs:extension base="xs:anyURI">
-                <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:simpleType name="RelationshipTypeOpenEnum">
-        <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
-    </xs:simpleType>
-
-    <xs:simpleType name="RelationshipType">
-        <xs:restriction base="xs:anyURI">
-            <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
-    <xs:element name="From" type="tns:EndpointReferenceType"/>
-    <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
-    <xs:element name="To" type="tns:AttributedURIType"/>
-    <xs:element name="Action" type="tns:AttributedURIType"/>
-
-    <xs:complexType name="AttributedURIType" mixed="false">
-        <xs:simpleContent>
-            <xs:extension base="xs:anyURI">
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <!-- Constructs from the WS-Addressing SOAP binding -->
-
-    <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
-
-    <xs:simpleType name="FaultCodesOpenEnumType">
-        <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
-    </xs:simpleType>
-
-    <xs:simpleType name="FaultCodesType">
-        <xs:restriction base="xs:QName">
-            <xs:enumeration value="tns:InvalidAddressingHeader"/>
-            <xs:enumeration value="tns:InvalidAddress"/>
-            <xs:enumeration value="tns:InvalidEPR"/>
-            <xs:enumeration value="tns:InvalidCardinality"/>
-            <xs:enumeration value="tns:MissingAddressInEPR"/>
-            <xs:enumeration value="tns:DuplicateMessageID"/>
-            <xs:enumeration value="tns:ActionMismatch"/>
-            <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
-            <xs:enumeration value="tns:DestinationUnreachable"/>
-            <xs:enumeration value="tns:ActionNotSupported"/>
-            <xs:enumeration value="tns:EndpointUnavailable"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
-    <xs:complexType name="AttributedUnsignedLongType" mixed="false">
-        <xs:simpleContent>
-            <xs:extension base="xs:unsignedLong">
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
-    <xs:complexType name="AttributedQNameType" mixed="false">
-        <xs:simpleContent>
-            <xs:extension base="xs:QName">
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
-
-    <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
-    <xs:complexType name="ProblemActionType" mixed="false">
-        <xs:sequence>
-            <xs:element ref="tns:Action" minOccurs="0"/>
-            <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:complexType>
-
-</xs:schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
deleted file mode 100644
index c43e5814ed..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!--
-
-    W3C XML Schema defined in the Web Services Policy 1.5
-    Framework specification
-
-    http://www.w3.org/TR/ws-policy-framework
-
-   Copyright Ā© 2006 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Ā® 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
-
-   $Id: ws-policy.xsd,v 1.2 2007/02/14 16:38:37 fsasaki Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:tns="http://www.w3.org/ns/ws-policy"
-    xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-    xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-    targetNamespace="http://www.w3.org/ns/ws-policy" blockDefault="#all"
-    elementFormDefault="qualified">
-
-  <xs:import
-      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" />
-
-  <xs:import
-      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" />
-
-  <xs:import
-      namespace="http://www.w3.org/XML/1998/namespace"
-      schemaLocation="http://www.w3.org/2001/xml.xsd" />
-
-    <!-- Constructs from the Web Services Policy 1.5 Framework -->
-
-  <xs:element name="Policy" >
-    <xs:complexType>
-
-      <xs:complexContent>
-        <xs:extension base="tns:OperatorContentType" >
-          <xs:attribute name="Name" type="xs:anyURI" />
-          <xs:anyAttribute namespace="##any" processContents="lax" />
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="All" type="tns:OperatorContentType" />
-  <xs:element name="ExactlyOne" type="tns:OperatorContentType" />
-
-  <xs:complexType name="OperatorContentType" >
-    <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded" >
-        <xs:element ref="tns:Policy" />
-        <xs:element ref="tns:All" />
-        <xs:element ref="tns:ExactlyOne" />
-
-        <xs:element ref="tns:PolicyReference" />
-        <xs:any namespace="##other" processContents="lax" />
-      </xs:choice>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:element name="PolicyReference" >
-    <xs:complexType>
-      <xs:sequence>
-        <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="URI" type="xs:anyURI" use="required" />
-
-      <xs:attribute name="Digest" type="xs:base64Binary" />
-      <xs:attribute name="DigestAlgorithm"
-                    type="xs:anyURI"
-                    default="http://www.w3.org/ns/ws-policy/Sha1Exc"
-                    />
-      <xs:anyAttribute namespace="##any" processContents="lax" />
-    </xs:complexType>
-  </xs:element>
-
-  <xs:attribute name="Optional" type="xs:boolean" default="false" />
-  <xs:attribute name="Ignorable" type="xs:boolean" default="false" />
-
-    <!-- Constructs from the Web Services Policy 1.5 Attachment -->
-
-  <xs:attribute name="PolicyURIs" >
-    <xs:simpleType>
-      <xs:list itemType="xs:anyURI" />
-    </xs:simpleType>
-  </xs:attribute>
-
-  <xs:element name="PolicyAttachment" >
-    <xs:complexType>
-      <xs:sequence>
-
-        <xs:element ref="tns:AppliesTo" />
-        <xs:choice maxOccurs="unbounded" >
-          <xs:element ref="tns:Policy" />
-          <xs:element ref="tns:PolicyReference" />
-        </xs:choice>
-        <!-- omitted only because it causes the content model to be non-determistic
-        <xs:element ref="wsse:Security" minOccurs="0" />
--->
-        <xs:any namespace="##other"
-        processContents="lax"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-      </xs:sequence>
-      <xs:anyAttribute namespace="##any" processContents="lax" />
-
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="AppliesTo" >
-    <xs:complexType>
-      <xs:sequence>
-        <xs:any namespace="##any"
-        processContents="lax"
-        maxOccurs="unbounded" />
-      </xs:sequence>
-      <xs:anyAttribute namespace="##any" processContents="lax" />
-
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="URI">
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="xs:anyURI">
-          <xs:anyAttribute namespace="##any" processContents="lax" />
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-
-</xs:schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
deleted file mode 100644
index 7fb8c1beed..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd">
-<!--
-   W3C XML Schema defined in the Web Services Description (WSDL)
-    Version 2.0 specification
-     http://www.w3.org/TR/wsdl20
-
-   Copyright ƂĀ© 2007 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ƂĀ® 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
-
-   $Id: wsdl20-instance.xsd,v 1.1 2007/06/19 15:59:38 plehegar Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/ns/wsdl-instance" targetNamespace="http://www.w3.org/ns/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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
deleted file mode 100644
index ac4b0ec8e6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of
-         the original XML Working Group.  This name is reserved by
-         the following decision of the W3C XML Plenary and
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
-
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang" type="xs:language">
-  <xs:annotation>
-   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
deleted file mode 100644
index c4e9808cfd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
-  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "XMLSchema.dtd"
- [
-   <!ATTLIST schema 
-     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
-   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
-   <!ENTITY % p ''>
-   <!ENTITY % s ''>
-  ]>
-
-<!-- Schema for XML Signatures
-    http://www.w3.org/2000/09/xmldsig#
-    $Revision$ on $Date$ by $Author: reagle $
-
-    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
-    of Technology, Institut National de Recherche en Informatique et en
-    Automatique, Keio University). All Rights Reserved.
-    http://www.w3.org/Consortium/Legal/
-
-    This document is governed by the W3C Software License [1] as described
-    in the FAQ [2].
-
-    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
--->
-
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
-        version="0.1" elementFormDefault="qualified"> 
-
-<!-- Basic Types Defined for Signatures -->
-
-<simpleType name="CryptoBinary">
-  <restriction base="base64Binary">
-  </restriction>
-</simpleType>
-
-<!-- Start Signature -->
-
-<element name="Signature" type="ds:SignatureType"/>
-<complexType name="SignatureType">
-  <sequence> 
-    <element ref="ds:SignedInfo"/> 
-    <element ref="ds:SignatureValue"/> 
-    <element ref="ds:KeyInfo" minOccurs="0"/> 
-    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/>
-</complexType>
-
-  <element name="SignatureValue" type="ds:SignatureValueType"/> 
-  <complexType name="SignatureValueType">
-    <simpleContent>
-      <extension base="base64Binary">
-        <attribute name="Id" type="ID" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-<!-- Start SignedInfo -->
-
-<element name="SignedInfo" type="ds:SignedInfoType"/>
-<complexType name="SignedInfoType">
-  <sequence> 
-    <element ref="ds:CanonicalizationMethod"/> 
-    <element ref="ds:SignatureMethod"/> 
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
-  <complexType name="CanonicalizationMethodType" mixed="true">
-    <sequence>
-      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
-  <complexType name="SignatureMethodType" mixed="true">
-    <sequence>
-      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) external namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- Start Reference -->
-
-<element name="Reference" type="ds:ReferenceType"/>
-<complexType name="ReferenceType">
-  <sequence> 
-    <element ref="ds:Transforms" minOccurs="0"/> 
-    <element ref="ds:DigestMethod"/> 
-    <element ref="ds:DigestValue"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="URI" type="anyURI" use="optional"/> 
-  <attribute name="Type" type="anyURI" use="optional"/> 
-</complexType>
-
-  <element name="Transforms" type="ds:TransformsType"/>
-  <complexType name="TransformsType">
-    <sequence>
-      <element ref="ds:Transform" maxOccurs="unbounded"/>  
-    </sequence>
-  </complexType>
-
-  <element name="Transform" type="ds:TransformType"/>
-  <complexType name="TransformType" mixed="true">
-    <choice minOccurs="0" maxOccurs="unbounded"> 
-      <any namespace="##other" processContents="lax"/>
-      <!-- (1,1) elements from (0,unbounded) namespaces -->
-      <element name="XPath" type="string"/> 
-    </choice>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- End Reference -->
-
-<element name="DigestMethod" type="ds:DigestMethodType"/>
-<complexType name="DigestMethodType" mixed="true"> 
-  <sequence>
-    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </sequence>    
-  <attribute name="Algorithm" type="anyURI" use="required"/> 
-</complexType>
-
-<element name="DigestValue" type="ds:DigestValueType"/>
-<simpleType name="DigestValueType">
-  <restriction base="base64Binary"/>
-</simpleType>
-
-<!-- End SignedInfo -->
-
-<!-- Start KeyInfo -->
-
-<element name="KeyInfo" type="ds:KeyInfoType"/> 
-<complexType name="KeyInfoType" mixed="true">
-  <choice maxOccurs="unbounded">     
-    <element ref="ds:KeyName"/> 
-    <element ref="ds:KeyValue"/> 
-    <element ref="ds:RetrievalMethod"/> 
-    <element ref="ds:X509Data"/> 
-    <element ref="ds:PGPData"/> 
-    <element ref="ds:SPKIData"/>
-    <element ref="ds:MgmtData"/>
-    <any processContents="lax" namespace="##other"/>
-    <!-- (1,1) elements from (0,unbounded) namespaces -->
-  </choice>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="KeyName" type="string"/>
-  <element name="MgmtData" type="string"/>
-
-  <element name="KeyValue" type="ds:KeyValueType"/> 
-  <complexType name="KeyValueType" mixed="true">
-   <choice>
-     <element ref="ds:DSAKeyValue"/>
-     <element ref="ds:RSAKeyValue"/>
-     <any namespace="##other" processContents="lax"/>
-   </choice>
-  </complexType>
-
-  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
-  <complexType name="RetrievalMethodType">
-    <sequence>
-      <element ref="ds:Transforms" minOccurs="0"/> 
-    </sequence>  
-    <attribute name="URI" type="anyURI"/>
-    <attribute name="Type" type="anyURI" use="optional"/>
-  </complexType>
-
-<!-- Start X509Data -->
-
-<element name="X509Data" type="ds:X509DataType"/> 
-<complexType name="X509DataType">
-  <sequence maxOccurs="unbounded">
-    <choice>
-      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
-      <element name="X509SKI" type="base64Binary"/>
-      <element name="X509SubjectName" type="string"/>
-      <element name="X509Certificate" type="base64Binary"/>
-      <element name="X509CRL" type="base64Binary"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </sequence>
-</complexType>
-
-<complexType name="X509IssuerSerialType"> 
-  <sequence> 
-    <element name="X509IssuerName" type="string"/> 
-    <element name="X509SerialNumber" type="integer"/> 
-  </sequence>
-</complexType>
-
-<!-- End X509Data -->
-
-<!-- Begin PGPData -->
-
-<element name="PGPData" type="ds:PGPDataType"/> 
-<complexType name="PGPDataType"> 
-  <choice>
-    <sequence>
-      <element name="PGPKeyID" type="base64Binary"/> 
-      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-    <sequence>
-      <element name="PGPKeyPacket" type="base64Binary"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-  </choice>
-</complexType>
-
-<!-- End PGPData -->
-
-<!-- Begin SPKIData -->
-
-<element name="SPKIData" type="ds:SPKIDataType"/> 
-<complexType name="SPKIDataType">
-  <sequence maxOccurs="unbounded">
-    <element name="SPKISexp" type="base64Binary"/>
-    <any namespace="##other" processContents="lax" minOccurs="0"/>
-  </sequence>
-</complexType> 
-
-<!-- End SPKIData -->
-
-<!-- End KeyInfo -->
-
-<!-- Start Object (Manifest, SignatureProperty) -->
-
-<element name="Object" type="ds:ObjectType"/> 
-<complexType name="ObjectType" mixed="true">
-  <sequence minOccurs="0" maxOccurs="unbounded">
-    <any namespace="##any" processContents="lax"/>
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
-  <attribute name="Encoding" type="anyURI" use="optional"/> 
-</complexType>
-
-<element name="Manifest" type="ds:ManifestType"/> 
-<complexType name="ManifestType">
-  <sequence>
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
-<complexType name="SignaturePropertiesType">
-  <sequence>
-    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
-   <complexType name="SignaturePropertyType" mixed="true">
-     <choice maxOccurs="unbounded">
-       <any namespace="##other" processContents="lax"/>
-       <!-- (1,1) elements from (1,unbounded) namespaces -->
-     </choice>
-     <attribute name="Target" type="anyURI" use="required"/> 
-     <attribute name="Id" type="ID" use="optional"/> 
-   </complexType>
-
-<!-- End Object (Manifest, SignatureProperty) -->
-
-<!-- Start Algorithm Parameters -->
-
-<simpleType name="HMACOutputLengthType">
-  <restriction base="integer"/>
-</simpleType>
-
-<!-- Start KeyValue Element-types -->
-
-<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
-<complexType name="DSAKeyValueType">
-  <sequence>
-    <sequence minOccurs="0">
-      <element name="P" type="ds:CryptoBinary"/>
-      <element name="Q" type="ds:CryptoBinary"/>
-    </sequence>
-    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
-    <element name="Y" type="ds:CryptoBinary"/>
-    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
-    <sequence minOccurs="0">
-      <element name="Seed" type="ds:CryptoBinary"/>
-      <element name="PgenCounter" type="ds:CryptoBinary"/>
-    </sequence>
-  </sequence>
-</complexType>
-
-<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
-<complexType name="RSAKeyValueType">
-  <sequence>
-    <element name="Modulus" type="ds:CryptoBinary"/> 
-    <element name="Exponent" type="ds:CryptoBinary"/> 
-  </sequence>
-</complexType> 
-
-<!-- End KeyValue Element-types -->
-
-<!-- End Signature -->
-
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-1.1-cd06.xsd
deleted file mode 100644
index b6be5df43b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-1.1-cd06.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-   
-   <include schemaLocation="sca-core-1.1-cd06.xsd"/>
-
-   <include schemaLocation="sca-interface-java-1.1-cd05.xsd"/>
-   <include schemaLocation="sca-interface-wsdl-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-interface-cpp-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-interface-c-1.1-cd06.xsd"/>
-
-   <include schemaLocation="sca-implementation-java-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-implementation-composite-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-implementation-cpp-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-implementation-c-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-implementation-bpel-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-implementation-spring-1.1-cd01.xsd"/>
-   
-   <!-- [rfeng] Added by Tuscany -->
-   <include schemaLocation="sca-jee-1.1-wd03.xsd"/>
-   
-   <include schemaLocation="sca-binding-ws-1.1-cd04-rev2.xsd"/>
-   <include schemaLocation="sca-binding-ws-callback-1.1-cd04-rev1.xsd"/>
-   <include schemaLocation="sca-binding-jms-1.1-cd04-rev2.xsd"/>
-   <include schemaLocation="sca-binding-jca-1.1-cd04-rev2.xsd"/>   
-   <include schemaLocation="sca-binding-sca-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-binding-ejb-1.1-cd02-rev2.xsd"/>
-
-   <include schemaLocation="sca-definitions-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
-
-   <include schemaLocation="sca-contribution-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-contribution-cpp-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-contribution-c-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-contribution-java-1.1-cd03.xsd"/>
-   
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev2.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev2.xsd
deleted file mode 100644
index 0b388fcf17..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd02-rev2.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-        elementFormDefault="qualified">
-        
-    <include schemaLocation="sca-core-1.1-cd06.xsd"/>
-
-    <element name="binding.ejb" type="sca:EJBSessionBeanBinding" 
-             substitutionGroup="sca:binding" />
-
-    <simpleType name="VersionValue">
-        <restriction base="string">
-            <enumeration value="EJB2"/>
-            <enumeration value="EJB3"/>
-        </restriction>
-    </simpleType>
-
-    <complexType name="EJBSessionBeanBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <element ref="sca:extensions" minOccurs="0" maxOccurs="1" /> 
-                </sequence>
-                <attribute name="homeInterface" type="NCName" use="optional"/>
-                <attribute name="ejb-link-name" type="string" use="optional"/>
-                <attribute name="ejb-version" type="sca:VersionValue" use="optional" default="EJB3"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev2.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev2.xsd
deleted file mode 100644
index 75446411db..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04-rev2.xsd
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 	elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd06.xsd" />
-
-   <complexType name="JCABinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-               <element name="outboundConnection" 
-                        type="sca:JCAOutboundConnection" minOccurs="0" />
-               <element name="inboundConnection" 
-                        type="sca:JCAInboundConnection" minOccurs="0" />
-               <element name="outboundInteraction" 
-                        type="sca:JCAOutboundInteraction" minOccurs="0" />
-               <element name="inboundInteraction" 
-                        type="sca:JCAInboundInteraction" minOccurs="0" />
-               <element name="property" type="sca:Property" minOccurs="0"
-                        maxOccurs="unbounded"/>
-               <element ref="sca:extensions" minOccurs="0" maxOccurs="1"/>
-            </sequence>
-            <attribute name="initialContextFactory" type="anyURI" 
-                       use="optional"/>
-    	   <attribute name="jndiURL" type="anyURI" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <simpleType name="JCACreateResource">
-      <restriction base="string">
-         <enumeration value="always" />
-         <enumeration value="never" />
-         <enumeration value="ifNotExist" />
-	    </restriction>
-   </simpleType>
-   <simpleType name="ResAuth">
-      <restriction base="string">
-         <enumeration value="container" />
-         <enumeration value="application" />
-      </restriction>
-   </simpleType>
-   <complexType name="JCAOutboundConnection">
-      <sequence>
-         <element name="resourceAdapter" type="sca:ResourceAdapter"
-                  minOccurs="0" />
-         <element name="connection" type="sca:Connection" />
-         <element name="resAuth" type="sca:ResAuth" minOccurs="0" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="managed" type="boolean" use="optional"	
-                default="true" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="JCAInboundConnection">
-      <sequence>
-         <element name="resourceAdapter" type="sca:ResourceAdapter" />
-         <element name="activationSpec" type="sca:ActivationSpec" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="JCAOutboundInteraction">
-      <sequence>
-         <element name="connectionSpec" type="sca:ConnectionSpec"
-                  minOccurs="0" />
-         <element name="interactionSpec" type="sca:InteractionSpec"
-                  minOccurs="0" />
-         <element name="operation" type="sca:Operation" minOccurs="0" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="JCAInboundInteraction">
-      <sequence>
-         <element name="listener" type="string" minOccurs="0" />
-         <element name="inboundOperation" type="sca:InboundOperation"
-                  minOccurs="0" maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="ResourceAdapter">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="name" type="NMTOKEN" use="optional" />
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="Connection">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="optional" />
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <attribute name="create" type="sca:JCACreateResource" use="optional"
-                 default="ifNotExist" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="ActivationSpec">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="optional" />
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <attribute name="create" type="sca:JCACreateResource" use="optional"
-                 default="ifNotExist"/>
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="Operation">
-      <sequence>
-         <element name="interactionSpec" type="sca:InteractionSpec"
-                  minOccurs="0" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="name" type="NMTOKEN" use="required" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="InboundOperation">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="required" />
-		<attribute name="selectedOperation" type="string" use="required" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-	<complexType name="ConnectionSpec">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="InteractionSpec">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-
-   <element name="binding.jca" type="sca:JCABinding"
-            substitutionGroup="sca:binding" />
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev2.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev2.xsd
deleted file mode 100644
index 8e303f3a3f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev2.xsd
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd06.xsd"/>
-
-   <complexType name="JMSBinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-               <element name="destination" type="sca:JMSDestination"
-                        minOccurs="0"/> 
-               <choice minOccurs="0" maxOccurs="1"> 
-                  <element name="connectionFactory" 
-                           type="sca:JMSConnectionFactory"/> 
-                  <element name="activationSpec" type="sca:JMSActivationSpec"/> 
-               </choice>     
-               <element name="response" type="sca:JMSResponse" minOccurs="0"/>
-               <element name="headers" type="sca:JMSHeaders" minOccurs="0"/>
-               <element name="messageSelection" type="sca:JMSMessageSelection"
-                        minOccurs="0"/>
-               <element name="resourceAdapter" type="sca:JMSResourceAdapter" 
-                        minOccurs="0"/>
-               <element name="operationProperties" 
-                        type="sca:JMSOperationProperties" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-               <element ref="sca:extensions" minOccurs="0" maxOccurs="1"/>
-            </sequence>
-            <attribute name="correlationScheme" type="QName"
-                       default="sca:messageID"/>
-            <attribute name="initialContextFactory" type="anyURI"/>
-            <attribute name="jndiURL" type="anyURI"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <simpleType name="JMSCreateResource">
-      <restriction base="string">
-         <enumeration value="always"/>
-         <enumeration value="never"/>
-         <enumeration value="ifNotExist"/>
-      </restriction>
-   </simpleType>
-
-   <complexType name="JMSDestination">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI"/>
-      <attribute name="type" use="optional" default="queue">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="queue"/>
-               <enumeration value="topic"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="create" type="sca:JMSCreateResource" 
-                 use="optional" default="ifNotExist"/>
-   </complexType>
-
-   <complexType name="JMSConnectionFactory">
-      <sequence>          <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI"/>
-      <attribute name="create" type="sca:JMSCreateResource" 
-                 use="optional" default="ifNotExist"/>
-   </complexType>
-
-   <complexType name="JMSActivationSpec">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI"/>
-      <attribute name="create" type="sca:JMSCreateResource"
-                 use="optional" default="ifNotExist"/>
-   </complexType>
-
-   <complexType name="JMSResponse">
-      <sequence>
-         <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1"/>
-         <element name="destination" type="sca:JMSDestination" minOccurs="0"/>
-         <choice minOccurs="0"> 
-            <element name="connectionFactory" type="sca:JMSConnectionFactory"/> 
-            <element name="activationSpec" type="sca:JMSActivationSpec"/> 
-         </choice> 
-      </sequence>
-   </complexType>
-
-   <complexType name="JMSHeaders">
-      <sequence>
-         <element name="property" type="sca:JMSUserProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="type" type="string"/>
-      <attribute name="deliveryMode" default="persistent">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="persistent"/>
-               <enumeration value="nonpersistent"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="timeToLive" type="long" default="0"/>
-      <attribute name="priority" default="4">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="0"/>
-               <enumeration value="1"/>
-               <enumeration value="2"/>
-               <enumeration value="3"/>
-               <enumeration value="4"/>
-               <enumeration value="5"/>
-               <enumeration value="6"/>
-               <enumeration value="7"/>
-               <enumeration value="8"/>
-               <enumeration value="9"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-   </complexType>
-
-   <complexType name="JMSMessageSelection"> 
-      <sequence> 
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/> 
-      </sequence> 
-      <attribute name="selector" type="string"/> 
-   </complexType>
-
-   <complexType name="JMSResourceAdapter">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-   </complexType>
-
-   <complexType name="JMSOperationProperties">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-         <element name="headers" type="sca:JMSHeaders" minOccurs="0"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-      <attribute name="selectedOperation" type="string"/>
-   </complexType>
-
-   <complexType name="BindingProperty">
-      <simpleContent>
-         <extension base="string">
-            <attribute name="name" type="NMTOKEN" use="required"/>
-            <attribute name="type" type="string" use="optional"
-                       default="xs:string"/>
-         </extension>
-      </simpleContent>
-   </complexType>
-
-   <simpleType name="JMSUserPropertyType">
-      <restriction base="string">
-         <enumeration value="boolean"/>
-         <enumeration value="byte"/>
-         <enumeration value="short"/>
-         <enumeration value="int"/>
-         <enumeration value="long"/>
-         <enumeration value="float"/>
-         <enumeration value="double"/>
-         <enumeration value="String"/>
-         <enumeration value="xs:string"/>
-      </restriction>
-   </simpleType>
-
-   <complexType name="JMSUserProperty">
-      <simpleContent>
-         <extension base="string">
-            <attribute name="name" type="NMTOKEN" use="required"/>
-            <attribute name="type" type="sca:JMSUserPropertyType"
-                       use="optional" default="String"/>
-         </extension>
-      </simpleContent>
-   </complexType>
-
-   <complexType name="JMSDefaultWireFormatType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-
-   <complexType name="JMSDefaultOperationSelectorType">
-      <complexContent>
-         <extension base="sca:OperationSelectorType"/>
-      </complexContent>
-   </complexType>
-
-   <element name="binding.jms" type="sca:JMSBinding" 
-            substitutionGroup="sca:binding"/>
-
-   <element name="wireFormat.jmsDefault" 
-            type="sca:JMSDefaultWireFormatType"
-            substitutionGroup="sca:wireFormat"/>
-
-   <element name="operationSelector.jmsDefault"
-            type="sca:JMSDefaultOperationSelectorType"
-            substitutionGroup="sca:operationSelector"/>
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd06.xsd
deleted file mode 100644
index 9cc22601b3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd06.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd06.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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev2.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev2.xsd
deleted file mode 100644
index f080e4ef49..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04-rev2.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"
-    xmlns:wsa="http://www.w3.org/2005/08/addressing"
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.w3.org/ns/wsdl-instance"
-            schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/>
-    <import namespace="http://www.w3.org/2005/08/addressing"
-            schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
-
-    <include schemaLocation="sca-core-1.1-cd06.xsd"/>
-
-    <element name="binding.ws" type="sca:WebServiceBinding"
-             substitutionGroup="sca:binding"/>
-
-    <complexType name="WebServiceBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <element ref="wsa:EndpointReference" 
-                             minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
-                </sequence>
-                <attribute name="wsdlElement" type="anyURI" use="optional"/>
-                <attribute ref="wsdli:wsdlLocation" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04-rev1.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04-rev1.xsd
deleted file mode 100644
index 7d5482e9f0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04-rev1.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright OASIS 2005, 2010. 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/200912" 
-    elementFormDefault="qualified">
-
-    <element name="WSCallback">
-        <complexType>
-            <sequence>
-                <any namespace="##other" processContents="lax" minOccurs="0"
-                     maxOccurs="unbounded"/>
-            </sequence>
-            <anyAttribute namespace="##any" processContents="lax"/>
-        </complexType>
-    </element>
-
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd06.xsd
deleted file mode 100644
index a3dea7eab4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd06.xsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd06.xsd"/>
-
-   <!-- Contribution -->
-   <element name="contribution" type="sca:ContributionType"/>
-   <complexType name="ContributionType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element name="deployable" type="sca:DeployableType" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-               <element ref="sca:importBase" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:exportBase" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
-            </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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd06.xsd
deleted file mode 100644
index 2a0feadac9..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd06.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2007,2010. 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/200912"

-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-	elementFormDefault="qualified">

-

-	<include schemaLocation="sca-contribution-1.1-cd06.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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd06.xsd
deleted file mode 100644
index a5201661c1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd06.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2006,2010. 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/200912"

-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-	elementFormDefault="qualified">

-

-	<include schemaLocation="sca-contribution-1.1-cd06.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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd03.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd03.xsd
deleted file mode 100644
index 89b90965a4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd03.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-contribution-1.1-cd06.xsd"/>
-
-   <!-- Import.java -->   
-   <element name="import.java" type="sca:JavaImportType"
-      substitutionGroup="sca:importBase" />
-   <complexType name="JavaImportType">
-      <complexContent>
-         <extension base="sca:Import">
-            <attribute name="package" type="string" use="required"/>
-            <attribute name="location" type="anyURI" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Export.java -->
-   <element name="export.java" type="sca:JavaExportType"
-      substitutionGroup="sca:exportBase" />
-   <complexType name="JavaExportType">
-      <complexContent>
-         <extension base="sca:Export">
-            <attribute name="package" type="string" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd06.xsd
deleted file mode 100644
index 668e3b1ce3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd06.xsd
+++ /dev/null
@@ -1,468 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-policy-1.1-cd04.xsd"/>	
-   <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>
-               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
-            </sequence>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Composite -->
-   <element name="composite" type="sca:Composite"/>
-   <complexType name="Composite">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:include" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element ref="sca:requires"/>
-                  <element ref="sca:policySetAttachment"/>
-                  <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="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" />
-               <element ref="sca:requires" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:policySetAttachment" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
-            </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">
-            <choice minOccurs="0" maxOccurs="unbounded">
-               <element ref="sca:requires"/>
-               <element ref="sca:policySetAttachment"/>
-            </choice>
-            <attribute name="remotable" type="boolean" use="optional"/>
-	        <attribute name="requires" type="sca:listOfQNames" 
-               use="optional"/>
-	        <attribute name="policySets" type="sca:listOfQNames" 
-               use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Reference -->
-   <complexType name="Reference">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="target" type="sca:listOfAnyURIs" 
-                       use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="required"/>
-            <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"
-              maxOccurs="unbounded"/>
-         <!-- 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="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="value" type="anySimpleType" use="optional"/>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-   
-   <complexType name="Property" mixed="true">
-      <complexContent mixed="true">
-         <extension base="sca:SCAPropertyBase">
-            <attribute name="mustSupply" type="boolean" use="optional" 
-                       default="false"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <complexType name="PropertyValue" mixed="true">
-      <complexContent mixed="true">
-         <extension base="sca:SCAPropertyBase">
-            <attribute name="source" type="string" use="optional"/>
-            <attribute name="file" type="anyURI" use="optional"/>
-         </extension>
-      </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" />
-               <element ref="sca:requires" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:policySetAttachment" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-            </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" abstract="true"/>
-   <complexType name="WireFormatType" abstract="true">
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-
-   <!-- OperationSelector Type -->
-   <element name="operationSelector" type="sca:OperationSelectorType"
-      abstract="true"/>
-   <complexType name="OperationSelectorType" abstract="true">
-      <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"/>
-               <element ref="sca:requires"/>
-               <element ref="sca:policySetAttachment"/>
-               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
-            </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="1" 
-                  maxOccurs="1"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ComponentService"/>
-                  <element name="reference" type="sca:ComponentReference"/>
-                  <element name="property" type="sca:PropertyValue"/>
-                  <element ref="sca:requires"/>
-                  <element ref="sca:policySetAttachment"/>
-               </choice>
-               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="autowire" type="boolean" 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>
-   
-   <!-- 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>
-   
-   <!-- 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"/>
-               <element ref="sca:requires" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:policySetAttachment" minOccurs="0"  
-                        maxOccurs="unbounded"/>              
-               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
-            </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">
-	        <choice minOccurs="0" maxOccurs="unbounded">
-	           <element ref="sca:requires"/>
-	           <element ref="sca:policySetAttachment"/>
-	        </choice>     
-            <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"/>
-            <attribute name="replace" type="boolean" use="optional" 
-               default="false"/>
-         </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>
-   
-   <!-- Extensions element -->
-   <element name="extensions">
-      <complexType>
-         <sequence>
-            <any namespace="##other" processContents="lax" 
-               minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-      </complexType>
-   </element>
-
-   <!-- 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"/>
-   
-   <!-- Value type definition for property values -->
-   <element name="value" type="sca:ValueType"/> 
-   <complexType name="ValueType" mixed="true">
-      <sequence> 
-         <any namespace="##any" processContents="lax" minOccurs="0"
-            maxOccurs='unbounded'/> 
-      </sequence> 
-      <!-- mixed="true" to handle simple type --> 
-      <anyAttribute namespace="##any" processContents="lax"/> 
-   </complexType> 
-   
-   <!-- 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>
-	
-   <simpleType name="CreateResource">
-      <restriction base="string">
-         <enumeration value="always" />
-         <enumeration value="never" />
-         <enumeration value="ifnotexist" />
-      </restriction>
-   </simpleType>
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd06.xsd
deleted file mode 100644
index 4781421138..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd06.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,20010. 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/200912" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd06.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd04.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:bindingType"/>
-               <element ref="sca:implementationType"/>
-               <element ref="sca:externalAttachment"/>
-               <any namespace="##other" processContents="lax" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-            </choice>
-            <attribute name="targetNamespace" type="anyURI" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
deleted file mode 100644
index ad5daf8224..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved. 

-     OASIS trademark, IPR and other policies apply. -->

-<schema 

-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-   xmlns="http://www.w3.org/2001/XMLSchema"

-   elementFormDefault="qualified">

-

-   <!-- SCA-Assembly XML Schema -->

-   <include schemaLocation="sca-core-1.1-cd06.xsd" />

-

-   <!-- SCA-BPEL Component Implementation Type -->

-   <element name="implementation.bpel" 

-      type="sca:BPELImplementation" substitutionGroup="sca:implementation" />

-

-   <complexType name="BPELImplementation">

-      <complexContent>

-         <extension base="sca:Implementation">

-            <sequence>

-               <any namespace="##other" processContents="lax"

-                  minOccurs="0" maxOccurs="unbounded" />

-            </sequence>

-            <attribute name="process" type="QName" use="required" />

-            <anyAttribute namespace="##other" processContents="lax" />

-         </extension>

-      </complexContent>

-   </complexType>

-

-</schema>

- 

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd06.xsd
deleted file mode 100644
index 8616c73de3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd06.xsd
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-	<!--

-		Copyright(C) OASIS(R) 2007,2010. 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/200912"

-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-	elementFormDefault="qualified">

-

-	<include schemaLocation="sca-core-1.1-cd06.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="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" />

-			</extension>

-		</complexContent>

-	</complexType>

-

-	<complexType name="CImplementationFunction">

-		<sequence>

-			<choice minOccurs="0" maxOccurs="unbounded">

-				<element ref="sca:requires"/>

-				<element ref="sca:policySetAttachment"/>

-			</choice>

-			<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" />

-		<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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd06.xsd
deleted file mode 100644
index 77ef5f3b0c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd06.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd06.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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd06.xsd
deleted file mode 100644
index 534f401d50..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd06.xsd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2006,2010. 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/200912"

-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-	elementFormDefault="qualified">

-

-	<include schemaLocation="sca-core-1.1-cd06.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" />

-			</extension>

-		</complexContent>

-	</complexType>

-

-	<simpleType name="CPPImplementationScope">

-		<restriction base="string">

-			<enumeration value="stateless" />

-			<enumeration value="composite" />

-		</restriction>

-	</simpleType>

-

-	<complexType name="CPPImplementationFunction">

-		<sequence>

-			<choice minOccurs="0" maxOccurs="unbounded">

-				<element ref="sca:requires"/>

-				<element ref="sca:policySetAttachment"/>

-			</choice>

-			<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" />

-		<attribute name="allowsPassByReference" type="boolean"

-			use="optional" />

-		<anyAttribute namespace="##other" processContents="lax" />

-	</complexType>

-

-</schema>

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
deleted file mode 100644
index 4fbbff25e2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd06.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"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
deleted file mode 100644
index 279b9abdb1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
-  elementFormDefault="qualified"
-  targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912">  
-	
-	<include schemaLocation="sca-core-1.1-cd06.xsd"/>
-	<element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/>
-	<complexType name="SpringImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="location" type="anyURI" use="required"/>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd06.xsd
deleted file mode 100644
index 33abeb456a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd06.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-	<!--

-		Copyright(C) OASIS(R) 2007,2010. 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/200912"

-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-	elementFormDefault="qualified">

-

-	<include schemaLocation="sca-core-1.1-cd06.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" />

-			</extension>

-		</complexContent>

-	</complexType>

-

-	<complexType name="CFunction">

-		<sequence>

-			<choice minOccurs="0" maxOccurs="unbounded">

-				<element ref="sca:requires"/>

-				<element ref="sca:policySetAttachment"/>

-			</choice>

-			<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" />

-		<attribute name="oneWay" type="boolean" use="optional" />

-		<attribute name="exclude" 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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd06.xsd
deleted file mode 100644
index e4881e5bb4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd06.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-	<!--

-		Copyright(C) OASIS(R) 2006,2010. 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/200912"

-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-	elementFormDefault="qualified">

-

-	<include schemaLocation="sca-core-1.1-cd06.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" />

-			</extension>

-		</complexContent>

-	</complexType>

-

-	<complexType name="CPPFunction">

-		<sequence>

-			<choice minOccurs="0" maxOccurs="unbounded">

-				<element ref="sca:requires"/>

-				<element ref="sca:policySetAttachment"/>

-			</choice>

-			<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" />

-		<attribute name="oneWay" type="boolean" use="optional" />

-		<attribute name="exclude" type="boolean" use="optional" />

-		<anyAttribute namespace="##other" processContents="lax" />

-	</complexType>

-

-</schema>

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd05.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd05.xsd
deleted file mode 100644
index a505ddd3fc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd05.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd06.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"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd06.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd06.xsd
deleted file mode 100644
index 6db2ca7d22..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd06.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd06.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"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
deleted file mode 100644
index 06f15cc9ca..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
+++ /dev/null
@@ -1,52 +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/200912" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-   elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd06.xsd"/>
-
-	<element name="implementation.ejb" type="sca:EJBImplementation" 
-      substitutionGroup="sca:implementation"/>
-	<complexType name="EJBImplementation">
-	   <complexContent>
-	      <extension base="sca:Implementation">
-	         <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="ejb-link" type="string" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-        </extension>
-      </complexContent>
-	</complexType>
-	<element name="implementation.web" type="sca:WebImplementation" 
-      substitutionGroup="sca:implementation"/>
-	<complexType name="WebImplementation">
-	   <complexContent>
-	      <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="web-uri" type="string" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-	</complexType>
-	<element name="implementation.jee" type="sca:JEEImplementation" 
-      substitutionGroup="sca:implementation"/>
-	<complexType name="JEEImplementation">
-      <complexContent>
-         <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="archive" type="string" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-	</complexType>
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
deleted file mode 100644
index adc66487fe..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"

-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"

-	elementFormDefault="qualified">

-

-    <!-- [rfeng] Comment out the include to avoid circular dependency -->

-    <!-- 

-	<include schemaLocation="sca-core-1.1-cd06.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="##other" processContents="lax"/>

-	</complexType>

-

-	<complexType name="IntentQualifier">

-		<sequence>

-			<element name="description" type="string" minOccurs="0" 

-			   maxOccurs="1" />

-			<any namespace="##other" processContents="lax" minOccurs="0"

-			   maxOccurs="unbounded"/> 

-		</sequence>

-  		<attribute name="name" type="NCName" use="required"/>

-  		<attribute name="default" type="boolean" use="optional" 

-  		   default="false"/>

-	</complexType>

-

-	<element name="requires"> 

-		<complexType>

-			<sequence minOccurs="0" maxOccurs="unbounded">

-				<any namespace="##other" processContents="lax"/>

-			</sequence>		

-			<attribute name="intents" type="sca:listOfQNames" use="required"/>

-			<anyAttribute namespace="##other" processContents="lax"/>

-		</complexType>

-	</element>

-

-	<element name="externalAttachment">

-		<complexType>

-			<sequence minOccurs="0" maxOccurs="unbounded">

-				<any namespace="##other" processContents="lax"/>

-			</sequence>

-			<attribute name="intents" type="sca:listOfQNames" use="optional"/>

-			<attribute name="policySets" type="sca:listOfQNames" use="optional"/>	

-			<attribute name="attachTo" type="string" use="required"/>

-			<anyAttribute namespace="##other" processContents="lax"/>

-		</complexType>

-	</element>

-

-	<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="optional"/>

-		<attribute name="attachTo" type="string" use="optional"/>

-		<anyAttribute namespace="##other" processContents="lax"/>

-	</complexType>

-

-	<element name="policySetAttachment">

-		<complexType>

-			<sequence minOccurs="0" maxOccurs="unbounded">

-				<any namespace="##other" processContents="lax"/>

-			</sequence>

-			<attribute name="name" type="QName" use="required"/>

-			<anyAttribute namespace="##other" processContents="lax"/>

-		</complexType>

-	</element>

-

-	<complexType name="PolicySetReference">

-		<attribute name="name" type="QName" use="required"/>

-		<anyAttribute namespace="##other" 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="##other" processContents="lax"/>

-	</complexType>

-

-	<complexType name="Qualifier">

-		<sequence minOccurs="0" maxOccurs="unbounded">

-			<any namespace="##other" processContents="lax"/>

-		</sequence>

-		<attribute name="name" type="string" use="required"/>

-		<anyAttribute namespace="##other" 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>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd04.xml b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd04.xml
deleted file mode 100644
index 0d6c5ac714..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd04.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved. 

-     OASIS trademark, IPR and other policies apply.  -->

-<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-                 

-	<!-- Security related intents -->                 

-        <sca:intent name="serverAuthentication" constrains="sca:binding"

-	    intentType="interaction">

-                <sca:description>

-			Communication through the binding requires that the 

-			server is authenticated by the client

-                </sca:description>

-                <sca:qualifier name="transport" default="true"/>

-                <sca:qualifier name="message"/>

-        </sca:intent>

-

-        <sca:intent name="clientAuthentication" constrains="sca:binding"

-	    intentType="interaction">

-                <sca:description>

-			Communication through the binding requires that the 

-			client is authenticated by the server

-                </sca:description>

-                <sca:qualifier name="transport" default="true"/>

-                <sca:qualifier name="message"/>

-        </sca:intent>

-

-        <sca:intent name="authentication" requires="sca:clientAuthentication">

-                <sca:description>

-			A convenience intent to help migration

-                </sca:description>

-        </sca:intent>

-

-        <sca:intent name="mutualAuthentication"

-                requires="sca:clientAuthentication sca:serverAuthentication">

-                <sca:description>

-			Communication through the binding requires that the

-			client and server to authenticate each other

-                </sca:description>

-        </sca:intent>

-

-        <sca:intent name="confidentiality" constrains="sca:binding"

-	    intentType="interaction">

-                <sca:description>

-			Communication through the binding prevents unauthorized 

-			users from reading the messages

-                </sca:description>

-                <sca:qualifier name="transport" default="true"/>

-                <sca:qualifier name="message"/>

-        </sca:intent>

-

-        <sca:intent name="integrity" constrains="sca:binding"

-	    intentType="interaction">

-                <sca:description>

-			Communication through the binding prevents tampering 

-			with the messages sent between the client and the service.

-                </sca:description>

-                <sca:qualifier name="transport" default="true"/>

-                <sca:qualifier name="message"/>

-        </sca:intent>

-

-        <sca:intent name="authorization" constrains="sca:implementation"

-	    intentType="implementation">

-                <sca:description>

-			Ensures clients are authorized to use services. 

-                </sca:description>

-        </sca:intent>

-

-	

-	<!-- Reliable messaging related intents -->    

-        <sca:intent name="atLeastOnce" constrains="sca:binding"

-	    intentType="interaction">

-                <sca:description>

-			This intent is used to indicate that a message sent

-			by a client is always delivered to the component.

-                </sca:description>

-        </sca:intent>

-

-        <sca:intent name="atMostOnce" constrains="sca:binding"

-	    intentType="interaction">

-                <sca:description>

-			This intent is used to indicate that a message that was 

-			successfully sent by a client is not delivered more than 

-			once to the component.

-                </sca:description>

-        </sca:intent>

-

-        <sca:intent name="exactlyOnce" requires="sca:atLeastOnce sca:atMostOnce"

-	    constrains="sca:binding" intentType="interaction">

-                <sca:description>

-			This profile intent is used to indicate that a message sent 

-			by a client is always delivered to the component. It also 

-			indicates that duplicate messages are not delivered to the 

-			component.

-            </sca:description>

-        </sca:intent>

-

-        <sca:intent name="ordered" constrains="sca:binding"

-	    intentType="interaction">

-                <sca:description>

-			This intent is used to indicate that all the messages are 

-			delivered to the component in the order they were sent by 

-			the client.

-                </sca:description>

-        </sca:intent>

-	

-	<!-- Transaction related intents -->

-        <sca:intent name="managedTransaction" excludes="sca:noManagedTransaction"

-	    mutuallyExclusive="true" constrains="sca:implementation" 

-	    intentType="implementation">

-                <sca:description>

-		A managed transaction environment is necessary in order to 

-		run the component. The specific type of managed transaction 

-		needed is not constrained.

-                </sca:description>

-                <sca:qualifier name="global" default="true">

-                        <sca:description>

-			For a component marked with managedTransaction.global 

-			a global transaction needs to be present before dispatching 

-			any method on the component - using any transaction 

-			propagated from the client or else beginning and completing 

-			a new transaction. 

-                        </sca:description>

-                </sca:qualifier>

-                <sca:qualifier name="local">

-                        <sca:description>

-			A component marked with managedTransaction.local needs to 

-			run within a local transaction containment (LTC) that 

-			is started and ended by the SCA runtime.

-                        </sca:description>

-                </sca:qualifier>

-        </sca:intent>

-

-        <sca:intent name="noManagedTransaction" excludes="sca:managedTransaction"

-	    constrains="sca:implementation" intentType="implementation">

-                <sca:description>

-		A component marked with noManagedTransaction needs to run without 

-		a managed transaction, under neither a global transaction nor 

-		an LTC. A transaction propagated to the hosting SCA runtime 

-		is not joined by the hosting runtime on behalf of a 

-		component marked with noManagedtransaction.

-                </sca:description>

-        </sca:intent>

-

-        <sca:intent name="transactedOneWay" excludes="sca:immediateOneWay"

-	    constrains="sca:binding" intentType="implementation">

-                <sca:description>

-		For a reference marked as transactedOneWay any OneWay invocation 

-		messages are transacted as part of a client global 

-		transaction.

-		For a service marked as transactedOneWay any OneWay invocation 

-		message are received from the transport binding in a 

-		transacted fashion, under the serviceā€™s global transaction.

-                </sca:description>

-        </sca:intent>

-

-        <sca:intent name="immediateOneWay" excludes="sca:transactedOneWay"

-	    constrains="sca:binding" intentType="implementation">

-                <sca:description>

-		For a reference indicates that any OneWay invocation messages 

-		are sent immediately regardless of any client transaction.

-		For a service indicates that any OneWay invocation is 

-		received immediately regardless of any target service 

-		transaction.

-                </sca:description>

-        </sca:intent>

-

-        <sca:intent name="propagatesTransaction" excludes="sca:suspendsTransaction"

-	    constrains="sca:binding" intentType="interaction">

-                <sca:description>

-		A service marked with propagatesTransaction is dispatched 

-		under any propagated (client) transaction and the service binding 

-		needs to be capable	of receiving a transaction context.

-		A reference marked with propagatesTransaction propagates any 

-		transaction context under which the client runs when the 

-		reference is used for a request-response interaction and the 

-		binding of a reference marked with propagatesTransaction needs to

-		be capable of propagating a transaction context. 

-                </sca:description>

-        </sca:intent>

-

-        <sca:intent name="suspendsTransaction" excludes="sca:propagatesTransaction"

-	    constrains="sca:binding" intentType="interaction">

-                <sca:description>

-		A service marked with suspendsTransaction is not dispatched 

-		under any propagated (client) transaction.

-		A reference marked with suspendsTransaction does not propagate 

-		any transaction context under which the client runs when the 

-		reference is used.

-                </sca:description>

-        </sca:intent>

-	

-        <sca:intent name="managedSharedTransaction"

-                requires="sca:managedTransaction.global sca:propagatesTransaction">

-                <sca:description>

-			Used to indicate that the component requires both the 

-			managedTransaction.global and the propagatesTransactions 

-			intents

-                </sca:description>

-        </sca:intent>

-	

-	<!-- Miscellaneous intents -->	

-	<sca:intent name="asyncInvocation" excludes="sca:propagatesTransaction"

-                constrains="sca:binding"	intentType="interaction">

-                <sca:description>

-			Indicates that request/response operations for the 

-			interface of this wire are "long running" and must be

-			treated as two separate message transmissions

-                </sca:description>

-    </sca:intent>

-	

-	<sca:intent name="EJB" constrains="sca:binding" 

-		intentType="interaction">

-                <sca:description>

-			Specifies that the EJB API is needed to communicate with

-			the service or reference.

-                </sca:description>

-    </sca:intent>

-    

-	<sca:intent name="SOAP" constrains="sca:binding" intentType="interaction" mutuallyExclusive="true">

-		<sca:description>

-		Specifies that the SOAP messaging model is used for delivering 

-		messages.

-                </sca:description>

-                <sca:qualifier name="v1_1" default="true"/>

-                <sca:qualifier name="v1_2"/>

-    </sca:intent>

-

-    <sca:intent name="JMS" constrains="sca:binding" intentType="interaction">

-                <sca:description>

-		Requires that the messages are delivered and received via the 

-		JMS API.

-                </sca:description>

-    </sca:intent>

-

-    <sca:intent name="noListener" constrains="sca:binding"

-	    intentType="interaction">

-                <sca:description>

-		This intent can only be used on a reference. Indicates that the 

-		client is not able to handle new inbound connections. The binding 

-		and callback binding are configured so that any 

-		response or callback comes either through a back channel of the 

-		connection from the client to the server or by having the client 

-		poll the server for messages. 

-                </sca:description>

-    </sca:intent>

-	

-</sca:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.xsd
deleted file mode 100644
index 603455a1f2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="binding.atom" type="t:AtomBinding" substitutionGroup="sca:binding"/>
-    
-    <complexType name="AtomBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <!-- sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence -->
-                <attribute name="title" type="string" use="optional"/>
-                <attribute name="description" type="string" use="optional"/>
-                <!-- anyAttribute namespace="##any" processContents="lax"/ -->
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
deleted file mode 100644
index 52445c14c5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="binding.dwr" type="t:DWRBinding" substitutionGroup="sca:binding"/>
-    
-    <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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
deleted file mode 100644
index 212c8abe4e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ /dev/null
@@ -1,69 +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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="binding.http" type="t:HTTPBinding" substitutionGroup="sca:binding"/>
-    
-    <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>
-
-   <complexType name="HTTPDefaultWireFormatType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-
-   <complexType name="HTTPXMLWireFormatType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-
-   <complexType name="HTTPDefaultOperationSelectorType">
-      <complexContent>
-         <extension base="sca:OperationSelectorType"/>
-      </complexContent>
-   </complexType>
-
-   <element name="wireFormat.httpDefault" type="t:HTTPDefaultWireFormatType" 
-            substitutionGroup="sca:wireFormat"/>
-
-   <element name="wireFormat.httpXml" type="t:HTTPXMLWireFormatType" 
-            substitutionGroup="sca:wireFormat"/>
-
-   <element name="operationSelector.httpDefault" type="t:HTTPDefaultOperationSelectorType" 
-            substitutionGroup="sca:operationSelector"/>
-
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
deleted file mode 100644
index 6dfc85e8cc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
+++ /dev/null
@@ -1,128 +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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-   <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-binding-jms-1.1-cd04-rev2.xsd"/>
-   
-   <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"  schemaLocation="sca-1.1-cd05-rev1.xsd"/>
-        
-   <!--  wire formats -->
-   <!-- -->
-   <complexType name="WireFormatJMSDefaultType">
-      <complexContent>
-         <extension base="sca:WireFormatType">
-             <attribute name="sendFormat" default="bytes">
-                  <simpleType>
-                      <restriction base="string">
-                         <enumeration value="text"/>
-                         <enumeration value="bytes"/>
-                      </restriction>
-                  </simpleType>             
-             </attribute>
-         </extension>
-      </complexContent>
-   </complexType>    
-   <element name="wireFormat.jmsdefault" 
-            type="t:WireFormatJMSDefaultType"
-            substitutionGroup="sca:wireFormat"/>            
-
-  <complexType name="WireFormatJMSTextType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-   <element name="wireFormat.jmsText" 
-            type="t:WireFormatJMSTextType"
-            substitutionGroup="sca:wireFormat"/>
-                  
-   <complexType name="WireFormatJMSTextXMLType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-   <element name="wireFormat.jmsTextXML" 
-            type="t:WireFormatJMSTextXMLType"
-            substitutionGroup="sca:wireFormat"/>
-      
-   <complexType name="WireFormatJMSBytesType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-   <element name="wireFormat.jmsBytes" 
-            type="t:WireFormatJMSBytesType"
-            substitutionGroup="sca:wireFormat"/>
-   
-   <complexType name="WireFormatJMSBytesXMLType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-   <element name="wireFormat.jmsBytesXML" 
-            type="t:WireFormatJMSBytesXMLType"
-            substitutionGroup="sca:wireFormat"/>
-   
-   <complexType name="WireFormatJMSObjectType">
-      <complexContent>
-         <extension base="sca:WireFormatType">
-             <attribute name="wrapSingle" default="false">
-                  <simpleType>
-                      <restriction base="string">
-                         <enumeration value="true"/>
-                         <enumeration value="false"/>
-                      </restriction>
-                  </simpleType>             
-             </attribute>
-         </extension>
-      </complexContent>
-   </complexType>       
-   <element name="wireFormat.jmsObject" 
-            type="t:WireFormatJMSObjectType"
-            substitutionGroup="sca:wireFormat"/>   
-   <!--  -->
-                   
-   <!--  operation selectors -->
-   <!-- -->      
-   <complexType name="OperationSelectorJMSDefaultType">
-      <complexContent>
-         <extension base="sca:OperationSelectorType"/>
-      </complexContent>
-   </complexType>    
-   <element name="operationSelector.jmsdefault" 
-            type="t:OperationSelectorJMSDefaultType"
-            substitutionGroup="sca:operationSelector"/>            
-
-   <complexType name="OperationSelectorJMSUserPropType">
-      <complexContent>
-         <extension base="sca:OperationSelectorType">
-             <attribute name="propertyName" type="string"/>           
-         </extension>         
-      </complexContent>
-   </complexType>    
-   <element name="operationSelector.jmsUserProp" 
-            type="t:OperationSelectorJMSUserPropType"
-            substitutionGroup="sca:operationSelector"/>
-
-	<!-- -->                           
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
deleted file mode 100644
index d1bdcbdfae..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="binding.jsonrpc" type="t:JSONRPCBinding" substitutionGroup="sca:binding"/>
-    
-    <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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd
deleted file mode 100644
index 05adf814c3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd
+++ /dev/null
@@ -1,105 +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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="binding.rest" type="t:RESTBinding" substitutionGroup="sca:binding"/>
-
-
-    <complexType name="RESTBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                	<element name="response" type="t:RESTResponse" minOccurs="0"/>
-                	<element ref="t:http-headers" minOccurs="0" maxOccurs="1"/>
-                    <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/ -->
-                </sequence>
-                <!-- anyAttribute namespace="##any" processContents="lax"/-->
-            </extension>
-        </complexContent>
-    </complexType>
-
-
-   <complexType name="RESTResponse">
-      <sequence>
-         <element ref="sca:wireFormat" minOccurs="0" />
-      </sequence>
-   </complexType>
-
-    <complexType name="HTTPHeadersType">
-        <sequence>
-        	<element ref="t:header" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-
-    <element name="http-headers" type="t:HTTPHeadersType"/>
-
-    <complexType name="HTTPHeaderType">
-        <attribute name="name" type="string" use="required" />
-        <attribute name="value" type="string" use="required" />
-    </complexType>
-
-	<element name="header" type="t:HTTPHeaderType" />
-
-    <!--  wire formats -->
-    <complexType name="WireFormatJSONType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-
-   <element name="wireFormat.json" type="t:WireFormatJSONType"
-            substitutionGroup="sca:wireFormat"/>
-
-   <complexType name="WireFormatXMLType">
-      <complexContent>
-         <extension base="sca:WireFormatType"/>
-      </complexContent>
-   </complexType>
-
-   <element name="wireFormat.xml" type="t:WireFormatXMLType"
-            substitutionGroup="sca:wireFormat"/>
-
-   <!--  operation selectors -->
-   <complexType name="OperationSelectorJAXRSType">
-      <complexContent>
-         <extension base="sca:OperationSelectorType"/>
-      </complexContent>
-   </complexType>
-   <element name="operationSelector.jaxrs"
-            type="t:OperationSelectorJAXRSType"
-            substitutionGroup="sca:operationSelector"/>
-
-   <complexType name="OperationSelectorRPCType">
-      <complexContent>
-         <extension base="sca:OperationSelectorType"/>
-      </complexContent>
-   </complexType>
-   <element name="operationSelector.rpc"
-            type="t:OperationSelectorRPCType"
-            substitutionGroup="sca:operationSelector"/>
-
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
deleted file mode 100644
index ea39a773e0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="binding.rmi" type="t:RMIBinding" substitutionGroup="sca:binding"/>
-    
-    <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/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.xsd
deleted file mode 100644
index 9857ec62b7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="binding.rss" type="t:RSSBinding" substitutionGroup="sca:binding"/>
-    
-    <complexType name="RSSBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <!--sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence -->
-                <attribute name="title" type="string" use="optional"/>
-                <attribute name="description" type="string" use="optional"/>
-                <!--anyAttribute namespace="##any" processContents="lax"/-->
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-contribution-resource.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-contribution-resource.xsd
deleted file mode 100644
index 09645724a4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-contribution-resource.xsd
+++ /dev/null
@@ -1,46 +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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-contribution-1.1-cd05-rev1.xsd"/>
-
-    <element name="import.resource" type="t:ImportResourceType" substitutionGroup="sca:importBase"/>
-    <complexType name="ImportResourceType">
-        <complexContent>
-            <extension base="sca:Import">
-                <attribute name="uri" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <element name="export.resource" type="t:ExportResourceType" substitutionGroup="sca:exportBase"/>
-    <complexType name="ExportResourceType">
-        <complexContent>
-            <extension base="sca:Export">
-                <attribute name="uri" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
deleted file mode 100644
index c97b91251b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
+++ /dev/null
@@ -1,53 +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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="implementation.osgi" type="t:OSGiImplementation" substitutionGroup="sca:implementation"/>
-
-    <complexType name="OSGiImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax"
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="bundleSymbolicName" type="string" use="required"/>
-                <attribute name="bundleVersion" type="string" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-   <element name="osgi.property" type="t:OSGiProperty"/>
-   <complexType name="OSGiProperty">
-      <simpleContent>
-        <extension base="string">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="value" type="string" use="optional"/>
-        </extension>
-      </simpleContent>
-   </complexType>
-
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
deleted file mode 100644
index fab809c7e1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
+++ /dev/null
@@ -1,38 +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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="implementation.script" type="t:ScriptImplementation" substitutionGroup="sca:implementation"/>
-
-    <complexType name="ScriptImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <attribute name="script" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
deleted file mode 100644
index 491cb2abce..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
+++ /dev/null
@@ -1,42 +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/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
-
-    <element name="implementation.widget" type="t:WidgetImplementation" substitutionGroup="sca:implementation"/>
-    	
-    <complexType name="WidgetImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
deleted file mode 100644
index 115c789225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ /dev/null
@@ -1,44 +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">
-
-<!--
-    <import namespace="http://www.w3.org/ns/wsdl-instance" schemaLocation="wsdli.xsd"/>
--->
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd06.xsd"/>
-
-
-    <include schemaLocation="tuscany-sca-1.1-binding-atom.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-jms.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-rest.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/>
-    <!--
-    <include schemaLocation="tuscany-sca-1.1-binding-rss.xsd"/>
-     -->
-
-    <include schemaLocation="tuscany-sca-1.1-contribution-resource.xsd"/>
-
-    <include schemaLocation="tuscany-sca-1.1-implementation-osgi.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-implementation-widget.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-implementation-script.xsd"/>
-</schema>
\ No newline at end of file