From 0f1e33e3adafb08edd767a9b400a45c9d377c5d4 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 6 Apr 2009 07:28:45 +0000
Subject: Delete ol 2.0 M2 RC1 tag

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@762236 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sampleTest/src/main/resources/TestClient.wsdl  | 102 ---------------------
 .../src/main/resources/TestClient_0002.composite   |  47 ----------
 .../src/main/resources/TestClient_0003.composite   |  47 ----------
 .../src/main/resources/TestComposite1.composite    |  40 --------
 .../src/main/resources/TestComposite10.composite   |  47 ----------
 .../src/main/resources/TestComposite11.composite   |  59 ------------
 .../src/main/resources/TestComposite12.composite   |  45 ---------
 .../src/main/resources/TestComposite13.composite   |  46 ----------
 .../src/main/resources/TestComposite14.composite   |  45 ---------
 .../src/main/resources/TestComposite15.composite   |  43 ---------
 .../src/main/resources/TestComposite16.composite   |  48 ----------
 .../src/main/resources/TestComposite17.composite   |  46 ----------
 .../src/main/resources/TestComposite18.composite   |  42 ---------
 .../src/main/resources/TestComposite19.composite   |  52 -----------
 .../src/main/resources/TestComposite2.composite    |  43 ---------
 .../src/main/resources/TestComposite20.composite   |  58 ------------
 .../src/main/resources/TestComposite21.composite   |  48 ----------
 .../src/main/resources/TestComposite22.composite   |  61 ------------
 .../src/main/resources/TestComposite23.composite   |  49 ----------
 .../src/main/resources/TestComposite24.composite   |  49 ----------
 .../src/main/resources/TestComposite25.composite   |  49 ----------
 .../src/main/resources/TestComposite26.composite   |  53 -----------
 .../src/main/resources/TestComposite27.composite   |  53 -----------
 .../src/main/resources/TestComposite3.composite    |  49 ----------
 .../src/main/resources/TestComposite4.composite    |  45 ---------
 .../src/main/resources/TestComposite5.composite    |  41 ---------
 .../src/main/resources/TestComposite6.composite    |  48 ----------
 .../src/main/resources/TestComposite7.composite    |  48 ----------
 .../src/main/resources/TestComposite8.composite    |  48 ----------
 .../src/main/resources/TestComposite9.composite    |  41 ---------
 .../src/main/resources/TestDuplicate1.composite    |  41 ---------
 .../src/main/resources/TestDuplicate2.composite    |  41 ---------
 .../src/main/resources/Test_ASM_0001.composite     |  33 -------
 .../src/main/resources/Test_ASM_0002.composite     |  48 ----------
 .../src/main/resources/Test_ASM_0003.composite     |  64 -------------
 .../src/main/resources/Test_ASM_0004.composite     |  62 -------------
 .../src/main/resources/Test_ASM_0005.composite     |  49 ----------
 .../src/main/resources/Test_ASM_0006.composite     |  47 ----------
 .../src/main/resources/Test_ASM_0007.composite     |  60 ------------
 .../src/main/resources/Test_ASM_0008.composite     |  61 ------------
 .../src/main/resources/Test_ASM_0009.composite     |  63 -------------
 .../src/main/resources/Test_ASM_0010.composite     |  51 -----------
 .../src/main/resources/Test_ASM_0011.composite     |  61 ------------
 .../src/main/resources/Test_ASM_0012.composite     | 101 --------------------
 .../src/main/resources/Test_ASM_0013.composite     |  62 -------------
 .../src/main/resources/Test_ASM_0014.composite     |  61 ------------
 .../src/main/resources/Test_ASM_0015.composite     |  62 -------------
 .../src/main/resources/Test_ASM_0016.composite     |  61 ------------
 .../src/main/resources/Test_ASM_0017.composite     |  61 ------------
 .../src/main/resources/Test_ASM_0018.composite     |  72 ---------------
 .../src/main/resources/Test_ASM_0019.composite     |  69 --------------
 .../src/main/resources/Test_ASM_0020.composite     |  71 --------------
 .../src/main/resources/Test_ASM_0021.composite     |  70 --------------
 .../src/main/resources/Test_ASM_0022.composite     |  50 ----------
 .../src/main/resources/Test_ASM_0023.composite     |  60 ------------
 .../src/main/resources/Test_ASM_0024.composite     |  60 ------------
 .../src/main/resources/Test_ASM_0025.composite     |  54 -----------
 .../src/main/resources/Test_ASM_0026.composite     |  57 ------------
 .../src/main/resources/Test_ASM_0027.composite     |  49 ----------
 .../src/main/resources/Test_ASM_0028.composite     |  51 -----------
 .../src/main/resources/Test_ASM_0029.composite     |  58 ------------
 .../src/main/resources/Test_ASM_0030.composite     |  51 -----------
 .../src/main/resources/Test_ASM_0031.composite     |  68 --------------
 .../src/main/resources/Test_ASM_0032.composite     |  66 -------------
 .../src/main/resources/Test_ASM_0033.composite     |  65 -------------
 .../src/main/resources/Test_ASM_0034.composite     |  65 -------------
 .../src/main/resources/Test_ASM_0101.composite     |  42 ---------
 .../src/main/resources/Test_ASM_6001.composite     |  49 ----------
 .../src/main/resources/Test_ASM_6002.composite     |  45 ---------
 .../src/main/resources/Test_ASM_6003.composite     |  50 ----------
 .../src/main/resources/Test_ASM_6004.composite     |  47 ----------
 .../src/main/resources/Test_ASM_6005.composite     |  48 ----------
 .../src/main/resources/Test_ASM_6006.composite     |  55 -----------
 .../src/main/resources/Test_ASM_6007.composite     |  55 -----------
 .../src/main/resources/Test_ASM_6008.composite     |  54 -----------
 .../src/main/resources/Test_ASM_6009.composite     |  54 -----------
 .../src/main/resources/Test_ASM_6010.composite     |  54 -----------
 .../src/main/resources/Test_ASM_6011.composite     |  54 -----------
 .../src/main/resources/Test_ASM_6012.composite     |  54 -----------
 .../src/main/resources/Test_ASM_6013.composite     |  47 ----------
 .../sampleTest/src/main/resources/Test_Types.xsd   |  38 --------
 81 files changed, 4363 deletions(-)
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient.wsdl
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient_0002.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient_0003.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite1.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite10.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite11.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite12.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite13.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite14.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite15.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite16.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite17.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite18.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite19.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite2.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite20.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite21.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite22.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite23.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite24.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite25.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite26.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite27.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite3.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite4.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite5.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite6.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite7.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite8.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite9.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestDuplicate1.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestDuplicate2.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0001.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0007.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0008.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0009.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0010.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0011.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0012.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0013.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0014.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0015.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0016.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0017.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0018.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0019.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0020.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0021.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0022.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0023.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0026.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0027.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0028.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0029.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0030.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0031.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0032.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0033.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0034.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0101.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6001.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6002.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6003.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6004.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6005.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6006.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6007.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6008.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6009.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6010.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6011.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6012.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6013.composite
 delete mode 100644 tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_Types.xsd

(limited to 'tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources')

diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient.wsdl b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient.wsdl
deleted file mode 100644
index f9475a016a..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient.wsdl
+++ /dev/null
@@ -1,102 +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.    
--->
-<!-- Produced from the TestInvocation,java interface by running a service
-     based on that interface in an SCA runtime using a Web services binding
-
-     Mike Edwards, 6th January 2008
--->
-<wsdl:definitions name="TestInvocationService" 
-  targetNamespace="http://test/" 
-  xmlns:tns="http://test/" 
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 
-  xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xs:schema targetNamespace="http://test/" version="1.0" xmlns:tns="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="TestException" type="tns:TestException"/>
-      <xs:complexType name="TestException">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="message" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-    </xs:schema>
-    <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" 
-      targetNamespace="http://test/" 
-      xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="invokeTest">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="invokeTestResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="invokeTest">
-    <wsdl:part name="invokeTest" element="tns:invokeTest">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="invokeTestResponse">
-    <wsdl:part name="invokeTestResponse" element="tns:invokeTestResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="TestException">
-    <wsdl:part name="TestException" element="tns:TestException">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="TestInvocation">
-    <wsdl:operation name="invokeTest">
-      <wsdl:input message="tns:invokeTest">
-    </wsdl:input>
-      <wsdl:output message="tns:invokeTestResponse">
-    </wsdl:output>
-      <wsdl:fault name="TestException" message="tns:TestException">
-    </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="TestInvocationBinding" type="tns:TestInvocation">
-    <SOAP:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="invokeTest">
-      <SOAP:operation soapAction=""/>
-      <wsdl:input>
-        <SOAP:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <SOAP:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="TestException">
-        <SOAP:fault name="TestException" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="TestInvocationService">
-    <wsdl:port name="TestInvocationPort" binding="tns:TestInvocationBinding">
-      <SOAP:address location="http://localhost:8080/TestClient"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient_0002.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient_0002.composite
deleted file mode 100644
index cf29e199d1..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient_0002.composite
+++ /dev/null
@@ -1,47 +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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestClient_0002">
-
-	<service name="TestInvocation" promote="TestClient/TestInvocation">
-		<interface.java interface="test.TestInvocation"/>
-	</service>
-	
-	<property name="testName" type="string"/>
-           
-    <component name="TestClient">
-		<implementation.java class="test.ASM_0002_Client"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-		</service>
-        <reference name="reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-        <property name="testName" source="$testName"/>
-    </component>
-    
-    <reference name="reference1" promote="TestClient/reference1">
-    	<interface.java interface="test.Service1"/>
-    </reference>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient_0003.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient_0003.composite
deleted file mode 100644
index 810a4e761a..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestClient_0003.composite
+++ /dev/null
@@ -1,47 +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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestClient_0003">
-
-	<service name="TestInvocation" promote="TestClient/TestInvocation">
-		<interface.java interface="test.TestInvocation"/>
-	</service>
-	
-	<property name="testName" type="string"/>
-           
-    <component name="TestClient">
-		<implementation.java class="test.ASM_0003_Client"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-		</service>
-        <reference name="reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-        <property name="testName" source="$testName"/>
-    </component>
-    
-    <reference name="reference1" promote="TestClient/reference1" multiplicity="1..n">
-    	<interface.java interface="test.Service1"/>
-    </reference>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite1.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite1.composite
deleted file mode 100644
index 9221a57ba5..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite1.composite
+++ /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.    
--->
-<!-- A simple composite which provides a single service and no references -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite1">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite10.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite10.composite
deleted file mode 100644
index 51f5de625b..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite10.composite
+++ /dev/null
@@ -1,47 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference, but where the reference has a binding
-     applied to it, with a target service identified   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite10">
-           
-	<service name="Service1" promote="Composite10Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="Composite10Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-    
-    <reference name="Reference1" promote="Composite10Component1/reference1">
-        <interface.java interface="test.Service1"/>
-        <binding.sca uri="TestComponent2/Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite11.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite11.composite
deleted file mode 100644
index 3cc3a4542b..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite11.composite
+++ /dev/null
@@ -1,59 +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.    
--->
-<!-- An example of a composite which has one component with a reference
-     that is multiplicity 1..1 and which is both wired to a service of a
-     second component in the same composite and is also promoted by a 
-     composite reference   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite11">
-           
-	<service name="Service1" promote="Composite11Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="Composite11Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <!-- reference is multiplicity 1..1 -->
-        <reference name="reference1" target="Composite11Component2/Service1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
- 
-    <component name="Composite11Component2">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">Composite11-C2</property>
-    </component>
-    
-    <reference name="Reference1" promote="Composite11Component1/reference1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite12.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite12.composite
deleted file mode 100644
index 81552d9802..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite12.composite
+++ /dev/null
@@ -1,45 +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.    
--->
-<!-- A simple composite which provides a single service and no references
-     plus a property with a complex type -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TestComposite12">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
-    
-    <property name="complexType" type="test:ComplexType1"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl5"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <property name="serviceData1" source="$complexType/firstData"/>
-        <property name="serviceData2" source="$complexType/secondData"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite13.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite13.composite
deleted file mode 100644
index 6790a83bc8..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite13.composite
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!-- A simple composite which provides a single service and no references
-     plus a property with a complex type with a type which is an XSD global
-     element -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TestComposite13">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
-    
-    <property name="complexType" element="test:globalElement1"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl5"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <property name="serviceData1" source="$complexType/firstData"/>
-        <property name="serviceData2" source="$complexType/secondData"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite14.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite14.composite
deleted file mode 100644
index 82a5f98280..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite14.composite
+++ /dev/null
@@ -1,45 +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.    
--->
-<!-- A simple composite which provides a single service and no references
-     plus a property with a simple type -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TestComposite14">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
-    
-    <property name="simpleType" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl5"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <property name="serviceData1" source="$simpleType"/>
-        <property name="serviceData2" source="$simpleType"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite15.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite15.composite
deleted file mode 100644
index 7444094622..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite15.composite
+++ /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.    
--->
-<!-- A simple composite which provides a single service and no references,
-     where the service is configured with multiple explicit bindings -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite15">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-		<binding.sca/>
-		<binding.ws/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite16.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite16.composite
deleted file mode 100644
index 35301ce4cb..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite16.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- A composite which has multiple <service/> subelements with the same @name and no references -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite16">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-	<service name="Service2" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite17.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite17.composite
deleted file mode 100644
index aff1c2c0e4..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite17.composite
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!-- A composite which has a single service with a @promote attribute
-     that does not reference the <service/> of a <component/> within the
-     <composite/> and no references -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite17">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-	
-	<service name="Service2" promote="SpuriousComponent/SpuriousService">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite18.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite18.composite
deleted file mode 100644
index 2ae3589b48..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite18.composite
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!-- A composite which has a single service with a declared <interface/>
-     that is a compatible subset of the interface of the component service
-     declared in the @promote attribute -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite18">
-           
-	<service name="Service1" promote="TestComponent1/Service1Superset">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-	
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1SupersetImpl"/>
-        <service name="Service1Superset">
-        	<interface.java interface="test.Service1Superset"></interface.java>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite19.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite19.composite
deleted file mode 100644
index 17a1d99b0a..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite19.composite
+++ /dev/null
@@ -1,52 +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.    
--->
-<!-- A composite which has a single <service/> subelement and multiple <reference/> 
-     subelements with the same @name value -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite19">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..n">
-        <interface.java interface="test.Service1"/>
-    </reference>
-
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..n">
-        <interface.java interface="test.Service1"/>
-    </reference>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite2.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite2.composite
deleted file mode 100644
index c0770c6d81..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite2.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite2">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-	
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite20.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite20.composite
deleted file mode 100644
index 73f1376947..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite20.composite
+++ /dev/null
@@ -1,58 +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.    
--->
-<!-- A composite which has a <composite/> <reference/> that is in error
-     since its @promote attribute is not the URI of a <component/> <reference/>
-     within the <composite/>   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite20">
-           
-	<service name="Service1" promote="Composite20Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="Composite20Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1"/>
-    </component>
- 
-    <component name="Composite20Component2">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">Composite11-C2</property>
-        <reference name="reference1"/>
-    </component>
-    
-    <!-- @promote deliberately incorrect - component names are non-existent -->
-    <reference name="Reference1" 
-        promote="Composite20Componentz/reference1 Composite20Componenty/reference1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite21.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite21.composite
deleted file mode 100644
index 6cd7451a02..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite21.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- A composite which has a <composite/> <reference/> that declares an interface
-     which is a superset of the interface declared by the <component/> <reference/>
-     promoted by the composite reference   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite21">
-           
-	<service name="Service1" promote="Composite21Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="Composite21Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1"/>
-    </component>
-   
-    <!-- reference declares a superset interface -->
-    <reference name="Reference1" promote="Composite21Component1/reference1">
-        <interface.java interface="test.Service1Superset"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite22.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite22.composite
deleted file mode 100644
index 0e645f0425..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite22.composite
+++ /dev/null
@@ -1,61 +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.    
--->
-<!-- A composite which has a <composite/> <reference/> that has no interface
-     declared that promotes 2 <component/> <reference/>s that have different
-     interfaces declared on them   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite22">
-           
-	<service name="Service1" promote="Composite22Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="Composite22Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
- 
-    <component name="Composite22Component2">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">Composite11-C2</property>
-        <reference name="reference1">
-            <interface.java interface="test.Service1Superset"/>
-        </reference>
-    </component>
-    
-    <!-- @promote deliberately incorrect - component names are non-existent -->
-    <reference name="Reference1" 
-        promote="Composite22Component1/reference1 Composite22Component2/reference1">
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite23.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite23.composite
deleted file mode 100644
index 5f2a5c7193..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite23.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 1..1 which promotes a 
-     component reference of multiplcity 0..1  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite23">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl6"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="1..1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite24.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite24.composite
deleted file mode 100644
index 758a593235..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite24.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 0..1 which promotes a 
-     component reference of multiplicity 0..n  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite24">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite25.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite25.composite
deleted file mode 100644
index 6e6caed073..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite25.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 1..1 which promotes a 
-     component reference of multiplicity 1..n  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite25">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl3"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="1..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="1..1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite26.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite26.composite
deleted file mode 100644
index bd777dc376..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite26.composite
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference and multiple <property/> elements all of
-     which have the same @name value  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite26">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
-    
-    <property name="propertyName" type="string"/>
-    <property name="propertyName" type="string"/>
-    <property name="propertyName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite27.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite27.composite
deleted file mode 100644
index edc5bdddad..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite27.composite
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!-- An example of a composite which which has a <component/> with a <reference/> 
-     element which has @autowire=true and where there is a compatible <component/>
-     <service/> in the same composite  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite27">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
-     
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" autowire="true">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">third</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite3.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite3.composite
deleted file mode 100644
index a465f45510..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite3.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- An example of a composite which is invalid because it has two
-     composite level references with the same @name attribute  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite3">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/Reference">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-    <reference name="Reference1" promote="TestComponent1/Reference">
-        <interface.java interface="test.Service1"/>
-    </reference>
-   
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite4.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite4.composite
deleted file mode 100644
index f89546b8da..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite4.composite
+++ /dev/null
@@ -1,45 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite4">
-           
-	<service name="Service1" promote="Composite4Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="Composite4Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-    
-    <reference name="Reference1" promote="Composite4Component1/reference1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite5.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite5.composite
deleted file mode 100644
index d5f7e21dc6..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite5.composite
+++ /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.    
--->
-<!-- Composite offering a single service, with a modified interface
-     type -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite5">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service2"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service2Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service2"></interface.java>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite6.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite6.composite
deleted file mode 100644
index 7f5a588e31..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite6.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 1..n   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite6">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl3"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="1..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="1..n">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite7.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite7.composite
deleted file mode 100644
index ea432f9145..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite7.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 0..n   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite7">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..n">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite8.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite8.composite
deleted file mode 100644
index ef5d75af39..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite8.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 0..1   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite8">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite9.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite9.composite
deleted file mode 100644
index a71d0d4e0b..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestComposite9.composite
+++ /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.    
--->
-<!-- Composite that provides a single service with the extended
-     Service1Superset interface -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite9">
-           
-	<service name="Service1" promote="Composite9Component1/Service1Superset">
-		<interface.java interface="test.Service1Superset"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="Composite9Component1">
-		<implementation.java class="test.service1SupersetImpl"/>
-        <service name="Service1Superset">
-        	<interface.java interface="test.Service1Superset"></interface.java>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestDuplicate1.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestDuplicate1.composite
deleted file mode 100644
index 193ab924bc..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestDuplicate1.composite
+++ /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.    
--->
-<!-- 1st of a pair of composite files where the composites have duplicated
-     names and targetNamespaces -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="DuplicateComposite">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">duplicate1</property>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestDuplicate2.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestDuplicate2.composite
deleted file mode 100644
index 3445d07a85..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/TestDuplicate2.composite
+++ /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.    
--->
-<!-- 2nd of a pair of composite files where the composites have duplicated
-     names and targetNamespaces -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="DuplicateComposite">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">duplicate2</property>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0001.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0001.composite
deleted file mode 100644
index ae5885596e..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0001.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0001">
-           
-    <component name="TestClient">
-		<implementation.java class="test.ASM_0001_Client"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-			<binding.sca/>
-		</service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0002.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
deleted file mode 100644
index 0d50dc4f4c..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!--
- ASM_0002_TestCase tests that component with a single reference can be wired to a single
- component service in the same composite.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0002">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-			<binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0002</property>
-    </component>
-
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0003.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
deleted file mode 100644
index cfce6d0d48..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
+++ /dev/null
@@ -1,64 +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.    
--->
-<!-- Test case that verifies that an implementation with a reference with multiplicity 1..n can
-     be validly wired to 3 target services and invoke them all correctly.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0003">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0003"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-			<binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1 TestComponent2/Service1 TestComponent3/Service1" />
-        <property name="testName">ASM_0003</property>
-    </component>
-
- 
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-    
-    <component name="TestComponent3">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service3</property>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0004.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
deleted file mode 100644
index ca75c33a71..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
+++ /dev/null
@@ -1,62 +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.    
--->
-<!-- Test that verifies that a reference with multiplicity 1..1 which is provided
-	 with multiple wire targets in the component configuration is marked as an error  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0004">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1 TestComponent2/Service1 TestComponent3/Service1" />
-        <property name="testName">ASM_0004</property>
-    </component>
-
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-    
-    <component name="TestComponent3">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service3</property>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0005.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
deleted file mode 100644
index aa9b8af911..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- Test that a component with multiple <service/> elements must have unique @name attributes for each 
-     service - negative test that has a component with 2 services with the same name   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0005">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0005</property>
-    </component>
-
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0006.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
deleted file mode 100644
index 3212c595b3..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
+++ /dev/null
@@ -1,47 +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.    
--->
-<!-- Test checks that the @name attribute of a <service/>
-     element of a <component/> matches the @name attribute of a <service/> element of the
-     componentType of the <implementation/> used by the <component/>   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0006">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/InvalidName" />
-        <property name="testName">ASM_0005</property>
-    </component>
-
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="InvalidName">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0007.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0007.composite
deleted file mode 100644
index 1f63746464..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0007.composite
+++ /dev/null
@@ -1,60 +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.    
--->
-<!-- Test that the @name attribute of a <reference/> element of a 
-     component is not equal to the @name attribute of any other 
-     <reference/> element of the same component   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0007">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0005</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite3"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- Two references with the same name - the implementation also has
-             two references of the same name so that the component type
-             matches the configuration of the component -->
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component>
-
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0008.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0008.composite
deleted file mode 100644
index 4b078ca7a3..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0008.composite
+++ /dev/null
@@ -1,61 +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.    
--->
-<!-- Tests that the @name attribute of a <reference/> element of a 
-     component is equal to the @name attribute of a <reference/> 
-     element of the <componentType/> of the <implementation/> of 
-     the <component/>  - negative test in that here there is a 
-     reference @name which does NOT match a reference name in the
-     component type -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0008">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0005</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- This reference has a name that does not match the name of a
-             Reference in the implementation -->
-        <reference name="InvalidName" target="TestComponent2/Service1"/>
-    </component>
-
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0009.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0009.composite
deleted file mode 100644
index 62ba494dcd..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0009.composite
+++ /dev/null
@@ -1,63 +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.    
--->
-<!-- Tests that the @name attribute of a <component/> element 
-     in a <composite/> is not the same as the @name 
-     attribute of a second component in the same <composite/> -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0009">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0009</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0010.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0010.composite
deleted file mode 100644
index 4454a75278..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0010.composite
+++ /dev/null
@@ -1,51 +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.    
--->
-<!-- Tests interface specified by the <interface/> child element of a 
-     <service/> element is a compatible subset of the interface declared 
-     for the <service/> element with the same @name attribute in the 
-     <componentType/> of the <implementation/> of the <component/> 
-     parent of the <service/> -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0010">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0010</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite5"/>
-		<!-- This service declares interface Service1 while the implementation offers
-		     Service2, which is not compatible with Service1 -->
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0011.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0011.composite
deleted file mode 100644
index 447cbcc83d..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0011.composite
+++ /dev/null
@@ -1,61 +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.    
--->
-<!-- Tests the multiplicity of a <reference/> element of a <component/> 
-     can be 1..1 where the multiplicity of the equivalent <reference/> 
-     element in the <componentType/> of the <implementation/> of the 
-     <component/> is 1..n -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0011">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0011</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite6"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of
-             the corresponding reference on the componentType of the implementation is 1..n -->
-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0012.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0012.composite
deleted file mode 100644
index c48b5ca601..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0012.composite
+++ /dev/null
@@ -1,101 +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.    
--->
-<!-- Tests that the the multiplicity 
-     of a <reference/> element of a <component/> can be any one of 0..1, 
-     1..1, 0..n, 1..n where the multiplicity of the equivalent <reference/> 
-     element in the <componentType/> of the <implementation/> of the 
-     <component/> is 0..n -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0012">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0012</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite7"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- The multiplicity declared for this reference is 0..1 while the multiplicity of
-             the corresponding reference on the componentType of the implementation is 0..n -->
-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="0..1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite7"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service2</property>
-        <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of
-             the corresponding reference on the componentType of the implementation is 0..n -->
-        <reference name="Reference1" target="TestComponent3/Service1" multiplicity="1..1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent3">
-		<implementation.composite name="tns:TestComposite7"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service3</property>
-        <!-- The multiplicity declared for this reference is 0..n while the multiplicity of
-             the corresponding reference on the componentType of the implementation is 0..n -->
-        <reference name="Reference1" target="TestComponent4/Service1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent4">
-		<implementation.composite name="tns:TestComposite7"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service4</property>
-        <!-- The multiplicity declared for this reference is 1..n while the multiplicity of
-             the corresponding reference on the componentType of the implementation is 0..n -->
-        <reference name="Reference1" target="TestComponent5/Service1" multiplicity="1..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent5">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service5</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0013.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0013.composite
deleted file mode 100644
index 91cca790ad..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0013.composite
+++ /dev/null
@@ -1,62 +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.    
--->
-<!-- Tests that the the multiplicity 
-     of a <reference/> element of a <component/> is 
-     1..1 where the multiplicity of the equivalent <reference/> 
-     element in the <componentType/> of the <implementation/> of the 
-     <component/> is 1..1 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0013">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0013</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of
-             the corresponding reference on the componentType of the implementation is 1..1 -->
-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0014.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0014.composite
deleted file mode 100644
index 698f7896a3..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0014.composite
+++ /dev/null
@@ -1,61 +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.    
--->
-<!-- Tests that the multiplicity of a <reference/> element of a 
-     <component/>  is 0..n where the multiplicity of the equivalent 
-     <reference/> element in the <componentType/> of the 
-     <implementation/> of the <component/> is 1..1 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0014">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0014</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- The multiplicity declared for this reference is 0..n while the multiplicity of
-             the corresponding reference on the componentType of the implementation is 1..1 -->
-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0015.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0015.composite
deleted file mode 100644
index 01c1d1d450..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0015.composite
+++ /dev/null
@@ -1,62 +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.    
--->
-<!-- Tests that the the multiplicity 
-     of a <reference/> element of a <component/> is 
-     1..1 where the multiplicity of the equivalent <reference/> 
-     element in the <componentType/> of the <implementation/> of the 
-     <component/> is 0..1 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0015">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0015</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite8"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of
-             the corresponding reference on the componentType of the implementation is 0..1 -->
-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0016.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0016.composite
deleted file mode 100644
index 98e2ffa41a..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0016.composite
+++ /dev/null
@@ -1,61 +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.    
--->
-<!-- Tests that the interface declared by the <interface/> child element 
-     of a <reference/> of a <component/> is a compatible superset of the 
-     interface declared on the corresponding <reference/> of the 
-     componentType of the <implementation/> of the <component/> -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0016">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0016</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1">
-            <!-- Component type has the interface = test.Service1 - here
-                 we use an interface that is a superset -->
-        	<interface.java interface="test.Service1Superset"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite9"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1Superset"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0017.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0017.composite
deleted file mode 100644
index d2c065ffd1..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0017.composite
+++ /dev/null
@@ -1,61 +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.    
--->
-<!-- Tests that where a <reference/> of a <component/> has no <binding/> 
-     child element, but the corresponding <reference/> element in the 
-     componentType does have a binding child element, the <binding/> 
-     from the componentType is used for the reference -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0017">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0017</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite10"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- ComponentType has a binding for this reference that 
-             identifies the target for this reference -->
-        <reference name="Reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0018.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0018.composite
deleted file mode 100644
index 4684bd5afe..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0018.composite
+++ /dev/null
@@ -1,72 +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.    
--->
-<!-- Tests that where a <reference/> of a <component/> has a <binding/> 
-     child element and the corresponding <reference/> element in the 
-     componentType has a binding child element, the <binding/> 
-     from the <reference/> is used for the reference -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0018">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0018</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite10"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- ComponentType has a binding for this reference that 
-             identifies a target for this reference -->
-        <reference name="Reference1">
-        	<interface.java interface="test.Service1"/>
-        	<binding.sca uri="TestComponent3/Service1"/>
-        </reference>
-    </component>
-    
-    <!-- This component is the target identified by the Component Type -->
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-    <!-- This component is the target identified by the reference -->
-    <component name="TestComponent3">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service3</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0019.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0019.composite
deleted file mode 100644
index 106ed5e5bd..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0019.composite
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!-- Tests that where a <reference/> of a <component/> has autowire=true
-     and also has target identifying a single target service that the 
-     reference is wired only to the single service identified by the 
-     target attribute -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0019">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0019</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite7"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" autowire="true" target="TestComponent3/Service1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <!-- This component is the target identified by the Component Type -->
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-    <!-- This component is the target identified by the reference -->
-    <component name="TestComponent3">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service3</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0020.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0020.composite
deleted file mode 100644
index 70b5a7b3c1..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0020.composite
+++ /dev/null
@@ -1,71 +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.    
--->
-<!-- Tests that where a <reference/> of a <component/> has 
-     @autowire=true and where there is also a single <wire/> element 
-     which as that <reference/> as its source that the reference is 
-     wired only to the single service identified by the <wire/> element  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0020">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0020</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite7"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" autowire="true">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <wire source="TestComponent1/Reference1" target="TestComponent3/Service1"/>
-    
-    <!-- This component is the target identified by the Component Type -->
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-    <!-- This component is the target identified by the reference -->
-    <component name="TestComponent3">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service3</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0021.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0021.composite
deleted file mode 100644
index e40949b012..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0021.composite
+++ /dev/null
@@ -1,70 +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.    
--->
-<!-- Tests that where a <reference/> of a <component/> has @autowire=true 
-     and where the <reference/> has a <binding/> child element which 
-     declares a single target service,  the reference is wired only to 
-     the single service identified by the <wire/> element   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0021">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0021</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite7"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" autowire="true">
-        	<interface.java interface="test.Service1"/>
-        	<binding.sca uri="TestComponent3/Service1"/>
-        </reference>
-    </component>
-    
-    <!-- This component is the target identified by the Component Type -->
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-    <!-- This component is the target identified by the reference -->
-    <component name="TestComponent3">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service3</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0022.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0022.composite
deleted file mode 100644
index 1bd3b43b2c..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0022.composite
+++ /dev/null
@@ -1,50 +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.    
--->
-<!-- Tests that where a <component/> <reference/> with multiplicity=0..1 
-     is unwired (by any means) that the component executes correctly   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0022">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0022</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite8"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- Reference is 0..1 and is deliberately left unwired -->
-        <reference name="Reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0023.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0023.composite
deleted file mode 100644
index a3a6465c09..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0023.composite
+++ /dev/null
@@ -1,60 +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.    
--->
-<!-- Tests that where a <component/> <reference/> with multiplicity=1..1 
-     is wired to a component service in the same composite and is also 
-     promoted by a <composite/> <reference/> which is wired to a target 
-     service by a component using the <composite/> as its implementation, 
-     that this is an error   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0023">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0023</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite11"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"></interface.java>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0024.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
deleted file mode 100644
index a140e3bfd5..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
+++ /dev/null
@@ -1,60 +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.    
--->
-<!-- Tests that where a <component/> <reference/> has @target set to 
-     some service, that the reference can have no child <binding/> elements   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0024">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0024</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1">
-        	<interface.java interface="test.Service1"/>
-        	<!-- A binding which contradicts the @target attribute -->
-        	<binding.ws/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        	<binding.ws/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>    
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0025.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
deleted file mode 100644
index 3209916612..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
+++ /dev/null
@@ -1,54 +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.    
--->
-<!-- Tests that where a <component/> <property/> has its value set by means 
-     of a child <value/> element, that the type of the <value/> element matches 
-     the type declared for the <property/> element   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0025">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0025</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite12"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- Property with complex type with a value declared using a <value/> subelement -->
-        <property name="complexType" type="test:ComplexType1">
-            <value>
-            	<firstData>complex1</firstData>
-            	<secondData>complex2</secondData>
-            </value>
-        </property>
-    </component> 
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0026.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0026.composite
deleted file mode 100644
index 45e7420646..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0026.composite
+++ /dev/null
@@ -1,57 +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.    
--->
-<!-- Tests that where a <component/> <property/> has its value set by means 
-     of a child element that is NOT a <value/> element, that a) the type of 
-     the <property/> element is declared as an XML Schema global element by 
-     its @element attribute and that the child element is an instance of that 
-     global element   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0026">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0026</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite13"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- Property with complex type with a value declared using a subelement 
-             with the correct XSD global element type -->
-        <property name="complexType" element="test:globalElement1">
-            <test:globalElement1>
-            	<firstData>complex1</firstData>
-            	<secondData>complex2</secondData>
-            </test:globalElement1>
-        </property>
-    </component> 
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0027.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0027.composite
deleted file mode 100644
index aa411a1955..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0027.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- Tests that where a <component/> has 2 or more <property/> child elements 
-     that each <property/> element has a unique @name attribute value   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0027">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0027</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- Multiple properties with the same @name attribute value - an error -->
-        <property name="serviceName">service2</property>
-        <property name="serviceName">service3</property>
-    </component> 
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0028.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0028.composite
deleted file mode 100644
index 07d36a29fd..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0028.composite
+++ /dev/null
@@ -1,51 +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.    
--->
-<!-- Tests that a <component/> <property/> @name attribute matches the 
-     @name attribute of one of the <property/> elements of the 
-     <componentType/> of the <implementation/> of the <component/>   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0028">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0028</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- Property with @name attribute that does not match the @name
-             attribute of any of the <property/> elements in the 
-             <componentType/> of the <implementation/> -->
-        <property name="randomName">randomValue</property>
-    </component> 
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0029.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0029.composite
deleted file mode 100644
index c35c2a4dca..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0029.composite
+++ /dev/null
@@ -1,58 +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.    
--->
-<!-- Tests that that where a <component/> <property/> has @many=false that 
-     there is only one <value/> child element of the <property/>   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0029">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0029</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite12"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- Property with complex type with many=false but 2 <value/>
-             subelements - which is an error -->
-        <property name="complexType" type="test:ComplexType1">
-        	<value>
-        		<test:firstData>SomeData</test:firstData>
-        		<test:secondData>MoreData</test:secondData>
-        	</value>
-        	<value>        	
-        		<test:firstData>SomeData2</test:firstData>
-        		<test:secondData>MoreData2</test:secondData>  	
-        	</value>
-        </property>
-    </component> 
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0030.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0030.composite
deleted file mode 100644
index 27a652958d..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0030.composite
+++ /dev/null
@@ -1,51 +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.    
--->
-<!-- Tests that a <component/> <property/> with a @value attribute set 
-does not have any <value/> child elements   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0030">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0030</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite14"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <!-- Property with value set via a @value attribute and also having 
-             <value/> child elements, which is an error -->
-        <property name="simpleType" value="someValue">
-        	<value>someOtherValue</value>
-        </property>
-    </component> 
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0031.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0031.composite
deleted file mode 100644
index d68fcac87d..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0031.composite
+++ /dev/null
@@ -1,68 +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.    
--->
-<!-- Tests that where a <component/> <reference/> has its @target attribute set 
-     to a valid service and the <composite/> also contains a <wire/> element with 
-     @source set to the <component/> <reference/> and @target set to a second valid 
-     service and has @replace=true,  the <reference/> is wired to the second service 
-     only   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0031">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0031</property>
-    </component>
-    
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component> 
-    
-    <!-- Here is a wire that overrides the reference target of TestComponent1/Reference1 -->
-    <wire source="TestComponent1/Reference1" target="TestComponent3/Service1" replace="true"/>
-    
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-     
-    <component name="TestComponent3">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service3</property>
-    </component> 
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0032.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0032.composite
deleted file mode 100644
index 06cce10ffe..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0032.composite
+++ /dev/null
@@ -1,66 +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.    
--->
-<!-- Tests that where a <component/> <service/> has no <binding/> subelements 
-     and the corresponding <service/> element of the <componentType/> of the 
-     <component/> <implementation/> has one or more <binding/> subelements, 
-     the <component/> <service/> is made available with all the bindings 
-     declared on the <service/> element of the <componentType/>   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0032">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0032</property>
-    </component>
-    
-    <!-- Implementation with a single reference with multiplicity 1..n which
-         has multiple concrete bindings applied to it -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite6"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1">
-        	<interface.java interface="test.Service1"/>
-        	<binding.sca uri="TestComponent2/Service1"/>
-        	<binding.ws uri="http://localhost:8080/TestComponent2"/>
-        </reference>
-    </component> 
-
-    <!-- A component with a service that has no bindings but where the service in the
-         componentType has multiple bindings explicitly set on it -->
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite15"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-     
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0033.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0033.composite
deleted file mode 100644
index 070b23d1ec..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0033.composite
+++ /dev/null
@@ -1,65 +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.    
--->
-<!-- Tests that where a <component/> <service/> has no <binding/> subelements 
-     and the corresponding <service/> element of the <componentType/> of the 
-     <component/> <implementation/> has no <binding/> subelements, the 
-     <component/> <service/> is made available with binding.sca   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0033">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0033</property>
-    </component>
-    
-    <!-- Implementation with a single reference with multiplicity 1..n which
-         has multiple concrete bindings applied to it -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite6"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1">
-        	<interface.java interface="test.Service1"/>
-        	<binding.sca uri="TestComponent2/Service1"/>
-        	<binding.sca uri="TestComponent2/Service1"/>
-        </reference>
-    </component> 
-
-    <!-- A component with a service that has no bindings set and where the service 
-         in the componentType has no bindings explicitly set on it -->
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-     
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0034.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0034.composite
deleted file mode 100644
index 37e282b5d5..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0034.composite
+++ /dev/null
@@ -1,65 +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.    
--->
-<!-- Tests that where a <component/> <service/> has 1 or more <binding/> 
-     subelements the <component/> <service/> is made available with 
-     all the bindings declared on the <service/> element    -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_0034">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_0034</property>
-    </component>
-    
-    <!-- Implementation with a single reference with multiplicity 1..n which
-         has multiple concrete bindings applied to it -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite6"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1">
-        	<interface.java interface="test.Service1"/>
-        	<binding.sca uri="TestComponent2/Service1"/>
-        	<binding.ws uri="http://localhost:8080/TestComponent2"/>
-        </reference>
-    </component> 
-
-    <!-- A component with a service that has multiple bindings explicitly set on it -->
-    <component name="TestComponent2">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        	<binding.sca/>
-		    <binding.ws/>
-        </service>
-        <property name="serviceName">service2</property>
-    </component>
-     
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0101.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0101.composite
deleted file mode 100644
index 9a5e53e75c..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_0101.composite
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0101">
-           
-    <component name="TestClient">
-		<implementation.java class="test.ASM_0001_Client"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-			<binding.sca/>
-			<binding.ws/>
-		</service>
-        <!--  reference name="testRef1" target="TestComponent1/service1" / -->
-    </component>
-
-<!--  
-    <component name="TestComponent1">
-		<implementation.java class="test.ASM_0001_Impl1"/>
-        <service name="service1"/>
-    </component>
--->
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6001.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6001.composite
deleted file mode 100644
index cd4701ff57..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6001.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- Tests that where a <component/> <service/> has 1 or more <binding/> 
-     subelements the <component/> <service/> is made available with 
-     all the bindings declared on the <service/> element    -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6001">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6001</property>
-    </component>
-    
-    <!-- Component which uses a composite as its implementation where the contribution 
-         contains 2 <composite/> artifacts which have identical names and targetNamspaces -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:DuplicateComposite"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-    </component> 
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6002.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6002.composite
deleted file mode 100644
index e5d59e186a..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6002.composite
+++ /dev/null
@@ -1,45 +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.    
--->
-<!-- Tests that where a <composite/> has multiple <service/> subelements 
-     that the @name attributes are unique across those subelements    -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6002">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6002</property>
-    </component>
-    
-    <!-- Component which uses a composite which has 2 <service/> subelements with
-         the same @name attribute -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite16"/>
-        <property name="serviceName">service1</property>
-    </component> 
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6003.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6003.composite
deleted file mode 100644
index c65c8634f8..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6003.composite
+++ /dev/null
@@ -1,50 +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.    
--->
-<!-- Tests that where a <composite/> has a <service/> subelement that the 
-     @promote attribute identifies a <service/> of a <component/> in the 
-     <composite/>    -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6003">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6003</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a <service/> subelements with
-         a @promote attribute which does not contain the name of a <service/> of 
-         one of the <component/> within the <composite/> -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite17"/>
-		<service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-    </component> 
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6004.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6004.composite
deleted file mode 100644
index 779358b5d3..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6004.composite
+++ /dev/null
@@ -1,47 +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.    
--->
-<!-- Tests that the <interface/> declared on a <service/> subelement of a 
-     <composite/> is a compatible subset of the <interface/> declared on 
-     the <component/> <service/> reference by the @promote attribute    -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6004">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6004</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a <service/> subelement which
-         has an <interface/> declared which is a compatible subset of the interface
-         of the promoted component service -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite18"/>
-        <property name="serviceName">service1</property>
-    </component> 
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6005.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6005.composite
deleted file mode 100644
index ea27808b17..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6005.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- Tests that the @name attribute of a <composite/> <reference/> element 
-is unique amongst the @name attributes of all the <reference/> elements of 
-that <composite/>    -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6005">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6005</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a single <service/> subelement 
-         and which has 2 <reference/> subelements with the same name - references
-         are 0..n multiplicity and so do not require wiring -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite19"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-    </component> 
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6006.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6006.composite
deleted file mode 100644
index 04647af815..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6006.composite
+++ /dev/null
@@ -1,55 +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.    
--->
-<!-- Tests that the @promote attribute of a <composite/> <reference/> contains 
-     one or more URIs that each point to a <reference/> of a <component/> in the 
-     <composite/>  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6006">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6006</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a single <service/> subelement 
-         and which has 2 <reference/> subelements with the same name - references
-         are 0..n multiplicity and so do not require wiring -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite20"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component> 
-    
-    <component name="TestComponent2">
-    	<implementation.composite name="tns:TestComposite1"/>
-    	<service name="Service1"/>
-    	<property name="serviceName">service2</property>
-    </component>
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6007.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6007.composite
deleted file mode 100644
index ed7f358e8d..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6007.composite
+++ /dev/null
@@ -1,55 +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.    
--->
-<!-- Tests that a <composite/> <reference/> can declare an <interface/> 
-     that is a compatible superset of the <interface/> declared by each 
-     <component/> <reference/> promoted by the composite reference   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6007">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6007</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a <reference/> element which
-         declares a superset interface -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite21"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component> 
-    
-    <!-- Implementation of the superset service -->
-    <component name="TestComponent2">
-    	<implementation.composite name="tns:TestComposite9"/>
-    	<service name="Service1"/>
-    	<property name="serviceName">service2</property>
-    </component>
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6008.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6008.composite
deleted file mode 100644
index 6f69735871..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6008.composite
+++ /dev/null
@@ -1,54 +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.    
--->
-<!-- Tests that where a <composite/> <reference/> has no <interface/> subelement, 
-     and that <reference/> promotes 2 or more <component/> <reference/>s, that the 
-     <interface/> declared on each of the <component/> <reference/>s are the same   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6008">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6008</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a <reference/> element which
-         promotes multiple component references which use different interfaces -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite22"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component> 
-    
-    <component name="TestComponent2">
-    	<implementation.composite name="tns:TestComposite1"/>
-    	<service name="Service1"/>
-    	<property name="serviceName">service2</property>
-    </component>
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6009.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6009.composite
deleted file mode 100644
index fd1cadd870..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6009.composite
+++ /dev/null
@@ -1,54 +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.    
--->
-<!-- Tests that a <component/> <reference/> with @multiplicity=0..1 can be 
-     promoted by a <composite/> <reference/> with @multiplicity=1..1   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6009">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6009</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a <reference/> element which
-         has @multiplicity=1..1 and which promotes a component reference which has
-         @multiplicity=0..1 -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite23"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component> 
-    
-    <component name="TestComponent2">
-    	<implementation.composite name="tns:TestComposite1"/>
-    	<service name="Service1"/>
-    	<property name="serviceName">service2</property>
-    </component>
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6010.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6010.composite
deleted file mode 100644
index f9525f171e..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6010.composite
+++ /dev/null
@@ -1,54 +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.    
--->
-<!-- Tests that a <component/> <reference/> with @multiplicity=0..n can be 
-     promoted by a <composite/> <reference/> with @multiplicity=0..1   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6010">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6010</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a <reference/> element which
-         has @multiplicity=0..1 and which promotes a component reference which has
-         @multiplicity=0..n -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite24"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component> 
-    
-    <component name="TestComponent2">
-    	<implementation.composite name="tns:TestComposite1"/>
-    	<service name="Service1"/>
-    	<property name="serviceName">service2</property>
-    </component>
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6011.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6011.composite
deleted file mode 100644
index a702d7b342..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6011.composite
+++ /dev/null
@@ -1,54 +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.    
--->
-<!-- Tests that a <component/> <reference/> with @multiplicity=1..n can be 
-     promoted by a <composite/> <reference/> with @multiplicity=1..1   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6011">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6011</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a <reference/> element which
-         has @multiplicity=1..1 and which promotes a component reference which has
-         @multiplicity=1..n -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite25"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component> 
-    
-    <component name="TestComponent2">
-    	<implementation.composite name="tns:TestComposite1"/>
-    	<service name="Service1"/>
-    	<property name="serviceName">service2</property>
-    </component>
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6012.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6012.composite
deleted file mode 100644
index f032838b50..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6012.composite
+++ /dev/null
@@ -1,54 +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.    
--->
-<!-- Tests that the @name attribute of a <property/> element of a <composite/> is 
-     unique amongst the @name attribute values of all the <property/> elements of 
-     that <composite/>   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6012">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6012</property>
-    </component>
-    
-    <!-- Component which uses a composite which has multiple <property/>
-         elements and where they all have the same @name value -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite26"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-        <reference name="Reference1" target="TestComponent2/Service1"/>
-    </component> 
-    
-    <component name="TestComponent2">
-    	<implementation.composite name="tns:TestComposite1"/>
-    	<service name="Service1"/>
-    	<property name="serviceName">service2</property>
-    </component>
-  
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6013.composite b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6013.composite
deleted file mode 100644
index 1e3dd250d5..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_ASM_6013.composite
+++ /dev/null
@@ -1,47 +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.    
--->
-<!-- Tests that a <component/> <reference/> with @autowire=true is wired 
-     to a compatible <component/> <service/> in the same <composite/>   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TEST_ASM_6013">
-           
-    <component name="TestClient">
-		<implementation.composite name="tns:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.java interface="test.TestInvocation"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TestComponent1/Service1" />
-        <property name="testName">ASM_6013</property>
-    </component>
-    
-    <!-- Component which uses a composite which has a <component/> with a <reference/> 
-         element which has @autowire=true and where there is a compatible <component/>
-         <service/> in the same composite -->
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite27"/>
-		<service name="Service1"/>
-        <property name="serviceName">service1</property>
-    </component> 
-    
-</composite>
diff --git a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_Types.xsd b/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_Types.xsd
deleted file mode 100644
index 98c57b1a55..0000000000
--- a/tags/java/sca/2.0-M2/stest/sampleTest/src/main/resources/Test_Types.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!-- Schema for Schema types used by the SCA TestCases -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://oasis/tests"
-    xmlns:test="http://oasis/tests"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    elementFormDefault="qualified">
-
-    <!-- A complex type -->
-    <complexType name="ComplexType1">
-        <sequence>
-            <element name="firstData" type="string" />
-            <element name="secondData" type="string" />
-        </sequence>
-    </complexType>
-    
-    <!-- A global element with a complex type -->
-    <element name="globalElement1" type="test:ComplexType1"/>
-       
-</schema>
\ No newline at end of file
-- 
cgit v1.2.3