Moving 2.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68
author: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2009-11-11 23:09:18 +0000
committer: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2009-11-11 23:09:18 +0000
commit: 4e13586bc791d71c41760cf4d0a5cc908973de3e (patch)
tree: 82e905f91d993f3a642168854371789150dfb2e8 /branches/sca-java-2.0-M2/modules/assembly-xsd
parent: cde3d2629677a07aa09e3c7fbe117b680c0f5df7 (diff)
33 files changed, 0 insertions, 2463 deletions
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/LICENSE b/branches/sca-java-2.0-M2/modules/assembly-xsd/LICENSE
deleted file mode 100644
index a48d7d44cc..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/LICENSE
+++ /dev/null
@@ -1,300 +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:
-
-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.
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M2/modules/assembly-xsd/META-INF/MANIFEST.MF
deleted file mode 100644
index 7d6d0951f4..0000000000
--- a/branches/sca-java-2.0-M2/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
-Tool: Bnd-0.0.255
-Bundle-Name: Apache Tuscany SCA Assembly Model XML Schemas
-Bnd-LastModified: 1225397088359
-Created-By: 1.6.0_07 (Sun Microsystems Inc.)
-Bundle-ManifestVersion: 2
-Bundle-Description: Apache Tuscany SCA Assembly Model XML Schemas
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL: http://www.apache.org/
-Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xsd
-
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/NOTICE b/branches/sca-java-2.0-M2/modules/assembly-xsd/NOTICE
deleted file mode 100644
index b5ca438931..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/NOTICE
+++ /dev/null
@@ -1,23 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the OASIS license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-Copyright (C) OASIS(R) 2005, 2009. All Rights Reserved.
-
-This product also includes software under the W3C(r) Software License
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-Copyright (c) 2004 World Wide Web Consortium (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(r) Software License [1] 
-in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-    [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/pom.xml b/branches/sca-java-2.0-M2/modules/assembly-xsd/pom.xml
deleted file mode 100644
index 9108cdf597..0000000000
--- a/branches/sca-java-2.0-M2/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-M2-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/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index 5007705d41..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,18 +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
-\ No newline at end of file
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
deleted file mode 100644
index d93cbd6c6b..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
-   
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-
-   <include schemaLocation="sca-interface-java-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-interface-wsdl-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-interface-cpp-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-interface-c-1.1-cd02.xsd"/>
-
-   <include schemaLocation="sca-implementation-java-1.1-cd01.xsd"/>
-   <include schemaLocation="sca-implementation-composite-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-implementation-cpp-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-implementation-c-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-implementation-bpel-1.1-cd02.xsd"/>
-
-   <include schemaLocation="sca-binding-ws-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-binding-jms-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-binding-jca-1.1-cd02.xsd"/>   
-   <include schemaLocation="sca-binding-sca-1.1-cd03.xsd"/>
-
-   <include schemaLocation="sca-definitions-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd02.xsd"/>
-
-   <include schemaLocation="sca-contribution-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-contribution-cpp-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-contribution-c-1.1-cd02.xsd"/>
-   
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
deleted file mode 100644
index 490c9659f4..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 	
-	    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 	
-        elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-	<complexType name="JCABinding">
-	<complexContent>
-	<extension base="sca:Binding">
-		<sequence>
-		<element name="jca.outbound.connection" 				
-			 type="sca:JCAOutboundConnection"
-			 minOccurs="0" />
-		<element name="jca.inbound.connection" 
-			 type="sca:JCAInboundConnection"
-			 minOccurs="0" />
-		<element name="jca.outbound.interaction" 
-			 type="sca:JCAOutboundInteraction"
-			 minOccurs="0" />
-		<element name="jca.inbound.interaction" 
-			 type="sca:JCAInboundInteraction"
-			 minOccurs="0" />
-		<element name="property" type="sca:Property" minOccurs="0"
-			 maxOccurs="unbounded" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-			 maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="connectionInfo" type="anyURI" use="optional" />
-	      <attribute name="initialContextFactory" 
-			 type="anyURI" use="optional"/>
-    	      <attribute name="jndiURL" type="anyURI" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax" />
-	</extension>
-	</complexContent>
-	</complexType>
-
-	<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="##any" 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>
-	</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>
-	</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>
-	</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="##any" 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="name" type="NMTOKEN" use="optional" />
-		<attribute name="type" type="NMTOKEN" use="required" />
-		<attribute name="create" type="sca:CreateResource" use="optional"
-			default="ifnotexist" />
-		<anyAttribute namespace="##any" 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="name" type="NMTOKEN" use="optional" />
-		<attribute name="type" type="NMTOKEN" use="required" />
-		<attribute name="create" type="sca:CreateResource" use="optional"
-			default="ifnotexist" />
-		<anyAttribute namespace="##any" 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="##any" 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="nativeOperation" type="string" use="required" />
-		<anyAttribute namespace="##any" 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="##any" 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="##any" processContents="lax" />
-	</complexType>
-	<element name="binding.jca" type="sca:JCABinding"
-		substitutionGroup="sca:binding" />
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
deleted file mode 100644
index 6a898c7e7b..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-
-   <complexType name="JMSBinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-       			<element name="destination" type="sca:JMSDestination" minOccurs="0"/>
-       			<element name="connectionFactory" type="sca:JMSConnectionFactory"/>
-       			<element name="activationSpec" type="sca:JMSActivationSpec"/>
-
-                <element name="response" type="sca:JMSResponse" minOccurs="0"/>
-                <element name="headers" type="sca:JMSHeaders" minOccurs="0"/>
-                <element name="subscriptionHeaders" type="sca:JMSSubscriptionHeaders" minOccurs="0"/>
-                <element name="resourceAdapter" type="sca:JMSResourceAdapter" minOccurs="0"/>
-                <element name="operationProperties" type="sca:JMSOperationProperties" minOccurs="0" maxOccurs="unbounded"/>
-                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="correlationScheme" type="QName" default="sca:MessageId"/>
-            <attribute name="initialContextFactory" type="anyURI"/>
-            <attribute name="jndiURL" type="anyURI"/>
-            <attribute name="requestConnection" type="QName"/>
-            <attribute name="responseConnection" type="QName"/>
-            <attribute name="operationProperties" type="QName"/>
-            <anyAttribute/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <complexType name="JMSDestination">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="required"/>
-      <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:CreateResource" 
-                 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" use="required"/>
-      <attribute name="create" type="sca:CreateResource" 
-                 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" use="required"/>
-      <attribute name="create" type="sca:CreateResource"
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="JMSResponse">
-      <sequence>
-         <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:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="JMSType" type="string"/>
-      <attribute name="JMSDeliveryMode">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="PERSISTENT"/>
-               <enumeration value="NON_PERSISTENT"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="JMSTimeToLive" type="long"/>
-      <attribute name="JMSPriority">
-         <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="JMSSubscriptionHeaders"> 
-      <sequence> 
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/> 
-      </sequence> 
-      <attribute name="JMSSelector" 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"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-      <attribute name="nativeOperation" type="string"/>
-   </complexType>
-
-   <complexType name="BindingProperty">
-      <simpleContent>
-         <extension base="string">
-            <attribute name="name" type="NMTOKEN"/>
-            <attribute name="type" type="string" use="optional"
-                       default="xs:string"/>
-         </extension>
-      </simpleContent>
-   </complexType>
-
-   <element name="binding.jms" type="sca:JMSBinding" 
-            substitutionGroup="sca:binding"/>
-
-   <element name="wireFormat.jmsdefault" type="sca:WireFormatType" 
-            substitutionGroup="sca:wireFormat"/>
-
-   <element name="operationSelector.jmsdefault" type="sca:OperationSelectorType" 
-            substitutionGroup="sca:operationSelector"/>
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
deleted file mode 100644
index 7a6d1a903b..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd03.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/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
deleted file mode 100644
index 17ce185d14..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    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-cd03.xsd"/>
-
-    <element name="binding.ws" type="sca:WebServiceBinding"
-             substitutionGroup="sca:binding"/>
-
-    <complexType name="WebServiceBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <element name="endpointReference" type="wsa:EndpointReferenceType"
-                             minOccurs="0" maxOccurs="unbounded"/>
-                    <any namespace="##other" processContents="lax"
-                         minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="wsdlElement" type="anyURI" use="optional"/>
-                <attribute ref="wsdli:wsdlLocation" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
deleted file mode 100644
index 17c2dd8285..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
+++ /dev/null
@@ -1,86 +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/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-
-   <!-- Contribution -->
-   <element name="contribution" type="sca:ContributionType"/>
-   <complexType name="ContributionType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element name="deployable" type="sca:DeployableType" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:importBase" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:exportBase" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Deployable -->
-   <complexType name="DeployableType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="composite" type="QName" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Import -->
-   <element name="importBase" type="sca:Import" abstract="true" />
-   <complexType name="Import" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>   
-   </complexType>
-   
-   <element name="import" type="sca:ImportType" substitutionGroup="sca:importBase"/>
-   <complexType name="ImportType">
-      <complexContent>
-         <extension base="sca:Import">
-            <attribute name="namespace" type="string" use="required"/>
-            <attribute name="location" type="anyURI" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Export -->
-   <element name="exportBase" type="sca:Export" abstract="true" />
-   <complexType name="Export" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>      
-   </complexType>
-   
-   <element name="export" type="sca:ExportType" substitutionGroup="sca:exportBase"/>
-   <complexType name="ExportType">
-      <complexContent>
-         <extension base="sca:Export">
-            <attribute name="namespace" type="string" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
deleted file mode 100644
index 4397834520..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-contribution-1.1-cd03.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/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
deleted file mode 100644
index 2271b780ee..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-contribution-1.1-cd03.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/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd
deleted file mode 100644
index 6c9e75c9df..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd
+++ /dev/null
@@ -1,518 +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/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <import namespace="http://www.w3.org/XML/1998/namespace" 
-           schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-   <!-- Common extension base for SCA definitions -->
-   <complexType name="CommonExtensionBase">
-      <sequence>
-         <element ref="sca:documentation" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-   
-   <element name="documentation" type="sca:Documentation"/>
-   <complexType name="Documentation" mixed="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded"/>
-      </sequence>
-      <attribute ref="xml:lang"/>
-   </complexType>
-
-   <!-- Component Type -->
-   <element name="componentType" type="sca:ComponentType"/>
-   <complexType name="ComponentType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:implementation" minOccurs="0"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ComponentService"/>
-                  <element name="reference" 
-                     type="sca:ComponentTypeReference"/>
-                  <element name="property" type="sca:Property"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Composite -->
-   <element name="composite" type="sca:Composite"/>
-   <complexType name="Composite">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element name="include" type="anyURI" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:Service"/>
-                  <element name="property" type="sca:Property"/>
-                  <element name="component" type="sca:Component"/>
-                  <element name="reference" type="sca:Reference"/>
-                  <element name="wire" type="sca:Wire"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="targetNamespace" type="anyURI" use="required"/>
-            <attribute name="local" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="autowire" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Contract base type for Service, Reference -->
-   <complexType name="Contract" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:binding" minOccurs="0" 
-                        maxOccurs="unbounded" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional" />
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Service -->
-   <complexType name="Service">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="promote" type="anyURI" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Interface -->
-   <element name="interface" type="sca:Interface" abstract="true"/>
-   <complexType name="Interface" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <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="autowire" type="boolean" use="optional"/>
-            <attribute name="target" type="sca:listOfAnyURIs" 
-                       use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="promote" type="sca:listOfAnyURIs" 
-                       use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Property -->
-   <complexType name="SCAPropertyBase" mixed="true">
-      <sequence>
-         <any namespace="##any" processContents="lax" minOccurs="0"/>
-         <!-- NOT an extension point; This any exists to accept
-             the element-based or complex type property
-             i.e. no element-based extension point under "sca:property" -->
-      </sequence>
-      <!-- mixed="true" to handle simple type -->
-      <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-      <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-   </complexType>
-   
-   <complexType name="Property" mixed="true">
-      <complexContent mixed="true">
-         <extension base="sca:SCAPropertyBase">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="mustSupply" type="boolean" use="optional" 
-                       default="false"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-         </extension>
-         <!-- extension defines the place to hold default value -->
-         <!-- an extension point ; attribute-based only -->
-      </complexContent>
-   </complexType>
-   
-   <!-- ConstrainingProperty is equivalent to the Property type but removes 
-        the capability to contain a value -->
-   <complexType name="ConstrainingProperty" mixed="true">
-      <complexContent mixed="true">
-         <restriction base="sca:Property">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="mustSupply" type="boolean" use="optional" 
-                       default="false"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-   <complexType name="PropertyValue" mixed="true">
-      <complexContent mixed="true">
-         <extension base="sca:SCAPropertyBase">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="source" type="string" use="optional"/>
-            <attribute name="file" type="anyURI" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-         </extension>
-         <!-- an extension point ; attribute-based only -->
-      </complexContent>
-   </complexType>
-
-   <!-- Binding -->
-   <element name="binding" type="sca:Binding" abstract="true"/>
-   <complexType name="Binding" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:operationSelector" minOccurs="0" 
-                        maxOccurs="1" />
-            </sequence>
-            <attribute name="uri" type="anyURI" use="optional"/>
-            <attribute name="name" type="NCName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Binding Type -->
-   <element name="bindingType" type="sca:BindingType"/>
-   <complexType name="BindingType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="type" type="QName" use="required"/>
-            <attribute name="alwaysProvides" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="mayProvide" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- WireFormat Type -->
-   <element name="wireFormat" type="sca:WireFormatType"/>
-   <complexType name="WireFormatType" abstract="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-
-   <!-- OperationSelector Type -->
-   <element name="operationSelector" type="sca:OperationSelectorType"/>
-   <complexType name="OperationSelectorType" abstract="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-   
-   <!-- Callback -->
-   <element name="callback" type="sca:Callback"/>
-   <complexType name="Callback">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <choice minOccurs="0" maxOccurs="unbounded">
-               <element ref="sca:binding"/>
-               <any namespace="##other" processContents="lax"/>
-            </choice>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Component -->
-   <complexType name="Component">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:implementation" minOccurs="0"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ComponentService"/>
-                  <element name="reference" type="sca:ComponentReference"/>
-                  <element name="property" type="sca:PropertyValue"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Component Service -->
-   <complexType name="ComponentService">
-      <complexContent>
-         <extension base="sca:Contract">
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Constraining Service -->
-   <complexType name="ConstrainingService">
-      <complexContent>
-         <restriction base="sca:ComponentService">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-
-   <!-- Component Reference -->
-   <complexType name="ComponentReference">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="target" type="sca:listOfAnyURIs" 
-                       use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="nonOverridable" type="boolean" use="optional" 
-                       default="false"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Constraining Reference -->
-   <complexType name="ConstrainingReference">
-      <complexContent>
-         <restriction base="sca:ComponentReference">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-         </restriction>
-      </complexContent>
-   </complexType>   
-   
-   <!-- Component Type Reference -->
-   <complexType name="ComponentTypeReference">
-      <complexContent>
-         <restriction base="sca:ComponentReference">
-            <sequence>
-               <element ref="sca:documentation" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:interface" minOccurs="0"/>
-               <element ref="sca:binding" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:callback" minOccurs="0"/>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-
-   <!-- Implementation -->
-   <element name="implementation" type="sca:Implementation" abstract="true"/>
-   <complexType name="Implementation" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Implementation Type -->
-   <element name="implementationType" type="sca:ImplementationType"/>
-   <complexType name="ImplementationType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="type" type="QName" use="required"/>
-            <attribute name="alwaysProvides" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="mayProvide" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Wire -->
-   <complexType name="Wire">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="source" type="anyURI" use="required"/>
-            <attribute name="target" type="anyURI" use="required"/>
-            <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>
-
-   <!-- Constraining Type -->
-   <element name="constrainingType" type="sca:ConstrainingType"/>
-   <complexType name="ConstrainingType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ConstrainingService"/>
-                  <element name="reference" 
-                           type="sca:ConstrainingReference"/>
-                  <element name="property" type="sca:ConstrainingProperty"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="targetNamespace" type="anyURI"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Intents within WSDL documents -->
-   <attribute name="requires" type="sca:listOfQNames"/>
-
-   <!-- Global attribute definition for @callback to mark a WSDL port type    
-        as having a callback interface defined in terms of a second port 
-        type. -->
-   <attribute name="callback" type="anyURI"/>
-
-   <!-- Miscellaneous simple type definitions -->
-   <simpleType name="Multiplicity">
-      <restriction base="string">
-         <enumeration value="0..1"/>
-         <enumeration value="1..1"/>
-         <enumeration value="0..n"/>
-         <enumeration value="1..n"/>
-      </restriction>
-   </simpleType>
-   
-   <simpleType name="OverrideOptions">
-      <restriction base="string">
-         <enumeration value="no"/>
-         <enumeration value="may"/>
-         <enumeration value="must"/>
-      </restriction>
-   </simpleType>
-   
-   <simpleType name="listOfQNames">
-      <list itemType="QName"/>
-   </simpleType>
-   
-   <simpleType name="listOfAnyURIs">
-      <list itemType="anyURI"/>
-   </simpleType>
-
-	<simpleType name="CreateResource">
-		<restriction base="string">
-			<enumeration value="always" />
-			<enumeration value="never" />
-			<enumeration value="ifnotexist" />
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
deleted file mode 100644
index 0feadcddcd..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd02.xsd"/>
-   
-   <!-- Definitions -->
-   <element name="definitions" type="sca:tDefinitions"/>
-   <complexType name="tDefinitions">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <choice minOccurs="0" maxOccurs="unbounded">
-               <element ref="sca:intent"/>
-               <element ref="sca:policySet"/>
-               <element ref="sca:binding"/>
-               <element ref="sca:bindingType"/>
-               <element ref="sca:implementationType"/>
-               <any namespace="##other" processContents="lax" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-            </choice>
-            <attribute name="targetNamespace" type="anyURI" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
deleted file mode 100644
index 3c19424a83..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
+++ /dev/null
@@ -1,31 +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 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-   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-cd03.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="##any" processContents="lax" />
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
deleted file mode 100644
index 11e191f0ed..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-	<element name="implementation.c" type="sca:CImplementation"
-		substitutionGroup="sca:implementation" />
-
-	<complexType name="CImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<element name="operation"
-						type="sca:CImplementationFunction" minOccurs="0"
-						maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="module" type="NCName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-				<attribute name="library" type="boolean" use="optional" />
-				<attribute name="componentType" type="string" use="required" />
-				<attribute name="scope" type="sca:CImplementationScope"
-					use="optional" />
-				<attribute name="eagerInit" type="boolean"
-					use="optional" />
-				<attribute name="init" type="boolean" use="optional" />
-				<attribute name="destoy" type="boolean" use="optional" />
-				<attribute name="allowsPassByReference" type="boolean"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<simpleType name="CImplementationScope">
-		<restriction base="string">
-			<enumeration value="stateless" />
-			<enumeration value="composite" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="CImplementationFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="allowsPassByReference" type="boolean"
-			use="optional" />
-		<attribute name="init" type="boolean" use="optional" />
-		<attribute name="destoy" type="boolean" use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
deleted file mode 100644
index 050f456386..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
+++ /dev/null
@@ -1,26 +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/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd03.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/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
deleted file mode 100644
index 771186a91d..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-	<element name="implementation.cpp" type="sca:CPPImplementation"
-		substitutionGroup="sca:implementation" />
-	<complexType name="CPPImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<element name="function"
-						type="sca:CPPImplementationFunction" minOccurs="0"
-						maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="library" type="NCName" use="required" />
-				<attribute name="header" type="NCName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-				<attribute name="class" type="Name" use="optional" />
-				<attribute name="componentType" type="string"
-					use="optional" />
-				<attribute name="scope"
-					type="sca:CPPImplementationScope" use="optional" />
-				<attribute name="eagerInit" type="boolean"
-					use="optional" />
-				<attribute name="allowsPassByReference" type="boolean"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<simpleType name="CPPImplementationScope">
-		<restriction base="string">
-			<enumeration value="stateless" />
-			<enumeration value="composite" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="CPPImplementationFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="allowsPassByReference" type="boolean"
-			use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
deleted file mode 100644
index 52c92e8259..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
+++ /dev/null
@@ -1,27 +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/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-
-   <!-- Java Implementation -->
-   <element name="implementation.java" type="sca:JavaImplementation" 
-            substitutionGroup="sca:implementation"/>
-   <complexType name="JavaImplementation">
-      <complexContent>
-         <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="class" type="NCName" use="required"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
deleted file mode 100644
index f2c7d2034f..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.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" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="CFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="oneWay" type="boolean" use="optional" />
-		<attribute name="input" type="NCName" use="optional" />
-		<attribute name="output" type="NCName" use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
deleted file mode 100644
index c214f7c37b..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.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" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="CPPFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="oneWay" type="boolean" use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
deleted file mode 100644
index 6acbe6cf1c..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-   
-   <!-- Java Interface -->
-   <element name="interface.java" type="sca:JavaInterface" 
-            substitutionGroup="sca:interface"/>
-   <complexType name="JavaInterface">
-      <complexContent>
-         <extension base="sca:Interface">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="interface" type="NCName" use="required"/>
-            <attribute name="callbackInterface" type="NCName" 
-                       use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
deleted file mode 100644
index f3abba888e..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-   
-   <!-- WSDL Interface -->
-   <element name="interface.wsdl" type="sca:WSDLPortType" 
-            substitutionGroup="sca:interface"/>
-   <complexType name="WSDLPortType">
-      <complexContent>
-         <extension base="sca:Interface">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="interface" type="anyURI" use="required"/>
-            <attribute name="callbackInterface" type="anyURI" 
-                       use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
deleted file mode 100644
index b3de95509e..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd"/>	
-	<import namespace="http://www.w3.org/ns/ws-policy"
-		schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
-
-	<element name="intent" type="sca:Intent"/>
-	<complexType name="Intent">
-		<sequence>
-			<element name="description" type="string" minOccurs="0"
-			   maxOccurs="1" />
-			<element name="qualifier" type="sca:IntentQualifier" 
-			   minOccurs="0" maxOccurs="unbounded" />
-			<any namespace="##other" processContents="lax" 
-			   minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="constrains" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="requires" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="excludes" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="mutuallyExclusive" type="boolean" 
-		   use="optional" default="false"/>
-		<attribute name="intentType" 
-			type="sca:InteractionOrImplementation" 
-			use="optional" default="interaction"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="IntentQualifier">
-		<sequence>
-			<element name="description" type="string" minOccurs="0" 
-			   maxOccurs="1" />
-		</sequence>
-  		<attribute name="name" type="NCName" use="required"/>
-  		<attribute name="default" type="boolean" use="optional" 
-  		   default="false"/>
-	</complexType>
-
-	<element name="policySet" type="sca:PolicySet"/>
-	<complexType name="PolicySet">
-		<choice minOccurs="0" maxOccurs="unbounded">
-  			<element name="policySetReference" 
-  			   type="sca:PolicySetReference"/>
-  			<element name="intentMap" type="sca:IntentMap"/>
-  			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="provides" type="sca:listOfQNames"/>
-		<attribute name="appliesTo" type="string" use="required"/>
-		<attribute name="attachTo" type="string" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<element name="policySetAttachment" 
-	   type="sca:PolicySetAttachment"/>
-	<complexType name="PolicySetAttachment">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="PolicySetReference">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="IntentMap">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="qualifier" type="sca:Qualifier"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="provides" type="QName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="Qualifier">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<simpleType name="listOfNCNames">
-		<list itemType="NCName"/>
-	</simpleType>
-
-	<simpleType name="InteractionOrImplementation">
-		<restriction base="string">
-			<enumeration value="interaction"/>
-			<enumeration value="implementation"/>
-		</restriction>
-	</simpleType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml
deleted file mode 100644
index 2e96713233..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml
+++ /dev/null
@@ -1,243 +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.  -->
-<sca:definitions xmlns:xml="http://www.w3.org/XML/1998/namespace" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">
-                 
-	<!-- Security related intents -->                 
-	<intent name="serverAuthentication" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding requires that the 
-			server is authenticated by the client
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent>
-
-	<intent name="clientAuthentication" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding requires that the 
-			client is authenticated by the server
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent>
-
-	<intent name="authentication" requires="clientAuthentication">
-		<description>
-			A convenience intent to help migration
-		</description>
-	</intent>
-
-	<intent name="mutualAuthentication"
-		requires="clientAuthentication serverAuthentication">
-		<description>
-			Communication through the binding requires that the
-			client and server to authenticate each other
-		</description>
-	</intent>
-
-	<intent name="confidentiality" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding prevents unauthorized 
-			users from reading the messages
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>	
-	</intent>
-
-	<intent name="integrity" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding prevents tampering 
-			with the messages sent between the client and the service.
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent> 
-
-	<intent name="authorization" constrains="sca:implementation" 
-	    intentType="implementation">
-		<description>
-			Ensures clients are authorized to use services. 
-		</description>
-		<qualifier name="fineGrain" default="true"/>
-	</intent>
-
-	
-	<!-- Reliable messaging related intents -->    
-	<intent name="atLeastOnce" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			This intent is used to indicate that a message sent
-			by a client is always delivered to the component.
-		</description>
-	</intent>
-
-	<intent name="atMostOnce" constrains="sca:binding" 
-	    intentType="interaction">
-		<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.
-		</description>
-	</intent>
-
-	<intent name="exactlyOnce" requires="atLeastOnce atMostOnce" 
-	    constrains="sca:binding" intentType="interaction">
-		<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.
-	    </description>
-	</intent>	           
-
-	<intent name="ordered" appliesTo="sca:binding" 
-	    intentType="interaction">
-		<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.
-		</description>
-	</intent>
-	
-	<!-- Transaction related intents -->
-	<intent name="managedTransaction" excludes="sca:noManagedTransaction" 
-	    mutuallyExclusive="true" constrains="sca:implementation" 
-	    intentType="implementation">
-		<description>
-		A managed transaction environment is necessary in order to 
-		run the component. The specific type of managed transaction 
-		needed is not constrained.
-		</description>
-		<qualifier name="global" default="true">
-			<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. 
-			</description>
-		</qualifier>
-		<qualifier name="local">
-			<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.
-			</description>
-		</qualifier>		
-	</intent>
-
-	<intent name="noManagedTransaction" excludes="sca:managedTransaction" 
-	    constrains="sca:implementation" intentType="implementation">
-		<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.
-		</description>
-	</intent>
-
-	<intent name="transactedOneWay" excludes="sca:immediateOneWay" 
-	    constrains="sca:binding" intentType="implementation">
-		<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.
-		</description>
-	</intent>
-
-	<intent name="immediateOneWay" excludes="transactedOneWay" 
-	    constrains="sca:binding" intentType="implementation">
-		<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.
-		</description>
-	</intent>
-
-	<intent name="propagatesTransaction" excludes="suspendsTransaction" 
-	    constrains="sca:binding" intentType="interaction">
-		<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. 
-		</description>
-	</intent>
-
-	<intent name="suspendsTransaction" excludes="propagatesTransaction" 
-	    constrains="sca:binding" intentType="interaction">
-		<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.
-		</description>
-	</intent>
-	
-	<intent name="managedSharedTransaction" 
-		requires="managedTransaction.global propagatesTransaction">
-		<description>
-			Used to indicate that the component requires both the 
-			managedTransaction.global and the propagatesTransactions 
-			intents
-		</description>
-	</intent>
-	
-	<!-- Miscellaneous intents -->	
-	<intent name="asyncInvocation" constrains="sca:Binding" 
-		intentType="interaction">
-		<description>
-			Indicates that request/response operations for the 
-			interface of this wire are "long running" and must be
-			treated as two separate message transmissions
-		</description>
-	</intent>
-	
-	<intent name="SOAP" constrains="sca:binding" intentType="interaction">
-		<description>
-		Specifies that the SOAP messaging model is used for delivering 
-		messages.
-		</description>
-		<qualifier name="1_1" default="true"/>
-		<qualifier name="1_2"/>
-	</intent>	
-
-	<intent name="JMS" constrains="sca:binding" intentType="interaction">
-		<description>
-		Requires that the messages are delivered and received via the 
-		JMS API.
-		</description>
-	</intent>
-
-	<intent name="noListener" constrains="sca:binding" 
-	    intentType="interaction">
-		<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. 
-		</description>
-	</intent>	
-	
-</sca:definitions>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
deleted file mode 100644
index bb3ad00cd7..0000000000
--- a/branches/sca-java-2.0-M2/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/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
-
-    <element name="binding.dwr" type="t:DWRBinding"/>
-    
-    <complexType name="DWRBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
deleted file mode 100644
index 32f2a51276..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
-
-    <element name="binding.http" type="t:HTTPBinding"/>
-    
-    <complexType name="HTTPBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
deleted file mode 100644
index 68dea85a12..0000000000
--- a/branches/sca-java-2.0-M2/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/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
-
-    <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
-    
-    <complexType name="JSONRPCBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
deleted file mode 100644
index fadf94fffe..0000000000
--- a/branches/sca-java-2.0-M2/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/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
-
-    <element name="binding.rmi" type="t:RMIBinding"/>
-    
-    <complexType name="RMIBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
deleted file mode 100644
index e90d9a0fa5..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
-
-    <element name="implementation.node" type="t:NodeImplementation"/>
-    	
-    <complexType name="NodeImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="uri" type="string" use="required"/>
-                <attribute name="composite" type="QName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
deleted file mode 100644
index d3a2711ee0..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ /dev/null
@@ -1,33 +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/2004/08/wsdl-instance" schemaLocation="wsdli.xsd"/>
-    
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd03.xsd"/>
-    
-    <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/>
-    
-    <include schemaLocation="tuscany-sca-1.1-implementation-node.xsd"/>
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/wsdli.xsd b/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/wsdli.xsd
deleted file mode 100644
index 79af5e9363..0000000000
--- a/branches/sca-java-2.0-M2/modules/assembly-xsd/src/main/resources/wsdli.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"-->
-<!-- $Id: wsdl-instance.xsd,v 1.1 2004/08/03 16:02:04 hugo Exp $ -->
-<!-- 
-   W3C XML Schema defined in the Web Services Description (WSDL)
-    Version 2.0 specification
-     http://www.w3.org/TR/wsdl20
-
-   Copyright (c) 2004 World Wide Web Consortium,
-  
-   (Massachusetts Institute of Technology, European Research Consortium for
-   Informatics and Mathematics, Keio University). All Rights Reserved. This
-   work is distributed under the W3C(r) Software License [1] in the hope that
-   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  
-   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" targetNamespace="http://www.w3.org/2004/08/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
-
-  <xs:attribute name="wsdlLocation">
-    <xs:annotation>
-      <xs:documentation>
-      This attribute can be used to provide some hints on where
-      additional WSDL information for a given namespace can be
-      found in order to help with QName resolution
-      </xs:documentation>
-    </xs:annotation>
-    <xs:simpleType>
-      <xs:list itemType="xs:anyURI"/>
-    </xs:simpleType>
-  </xs:attribute>
-
-</xs:schema>
author	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2009-11-11 23:09:18 +0000
committer	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2009-11-11 23:09:18 +0000
commit	4e13586bc791d71c41760cf4d0a5cc908973de3e (patch)
tree	82e905f91d993f3a642168854371789150dfb2e8 /branches/sca-java-2.0-M2/modules/assembly-xsd
parent	cde3d2629677a07aa09e3c7fbe117b680c0f5df7 (diff)