From a40e527938d76ba71f211da7e327adb50384ba69 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 11 Nov 2009 23:26:33 +0000
Subject: Moving 1.x tags

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835157 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/binding_resolution.composite    | 43 ---------------
 .../src/main/resources/callback_bindings.composite | 56 -------------------
 .../src/main/resources/component.composite         | 41 --------------
 .../component_duplicate_property.composite         | 35 ------------
 .../main/resources/component_property_1.composite  | 48 -----------------
 .../main/resources/component_property_2.composite  | 52 ------------------
 .../main/resources/component_property_3.composite  | 38 -------------
 .../src/main/resources/nonuniquename.composite     | 33 ------------
 .../nonuniqueservicenameincomponenttype.composite  | 29 ----------
 .../nonuniqueservicenameincomposite.composite      | 47 ----------------
 .../resources/notcompatibleinterface.composite     | 38 -------------
 .../main/resources/notmatchofservicename.composite | 41 --------------
 .../component/impl/ABServiceImpl.componentType     | 32 -----------
 .../component/impl/DServiceImpl.componentType      | 31 -----------
 .../component/impl/EServiceImpl.componentType      | 31 -----------
 .../component/impl/FServiceImpl.componentType      | 42 ---------------
 .../reference_multiplicity_moretargets.composite   | 62 ----------------------
 .../reference_multiplicity_multitargets.composite  | 58 --------------------
 .../reference_multiplicity_ntargets.composite      | 59 --------------------
 .../reference_multiplicity_zerotarget.composite    | 51 ------------------
 .../main/resources/reference_wiredbyimpl.composite | 59 --------------------
 .../src/main/resources/referencename.composite     | 49 -----------------
 .../src/main/resources/referencename_1.composite   | 50 -----------------
 .../src/main/resources/referencename_2.composite   | 51 ------------------
 .../src/main/resources/referencename_3.composite   | 52 ------------------
 .../src/main/resources/referencename_4.composite   | 53 ------------------
 .../src/main/resources/serviceelement.composite    | 42 ---------------
 .../main/resources/servicewithbinding.composite    | 33 ------------
 .../main/resources/servicewithinterface.composite  | 32 -----------
 .../src/main/resources/zerocomponents.composite    | 25 ---------
 .../src/main/resources/zeroimplelements.composite  | 38 -------------
 31 files changed, 1351 deletions(-)
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/binding_resolution.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/callback_bindings.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_1.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_2.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_3.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniquename.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_1.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_2.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_3.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_4.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/serviceelement.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/servicewithbinding.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/servicewithinterface.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/zerocomponents.composite
 delete mode 100644 tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/zeroimplelements.composite

(limited to 'tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources')

diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/binding_resolution.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/binding_resolution.composite
deleted file mode 100644
index d113ba26c3..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/binding_resolution.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://www.osoa.org/xmlns/sca/1.0"
-	name="binding-resolution" targetNamespace="assembly-tests">
- 	      
-    <component name="FComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.FServiceImpl"/>
-		
-		<service name="FService1">
-		    <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
-		</service>
-		
-		<service name="FService2">
-		    <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
-		    
-		</service>
-		
-		<service name="FService3">
-		    <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
-		    <binding.ws uri="http://localhost:8085/FService3"/>
-		</service>
-		
-		
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/callback_bindings.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/callback_bindings.composite
deleted file mode 100644
index 29dc96098e..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/callback_bindings.composite
+++ /dev/null
@@ -1,56 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-callback-bindings">
-
-	<component name="MyServiceClientComponent">
-	<implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.callback.MyClientImpl"/>	
-	<reference name="myService" target="MyServiceImplComponent/MyService">
-            
-            <callback>
-                <binding.sca/>
-                <binding.jms/>    
-                <binding.ws uri="http://localhost:8087/MyService"/> 
-                <binding.ws uri="http://localhost:8088/MyService"/>
-            </callback>
-            
-        </reference>
-	
-	</component>
-
-    <component name="MyServiceImplComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.callback.MyServiceImpl"/>
-       
-        <service name="MyService">
-            <!--<interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.callback.MyService"/>-->
-            <callback>
-                <binding.sca/>
-                <binding.jms/>
-                <binding.ws uri="http://localhost:8087/MyService"/>
-            </callback>
-        </service>
-              
-    </component>
-    
-    
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component.composite
deleted file mode 100644
index bb452feac9..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/>
-	    <reference name="b" target="BComponent"/>
-	    <reference name="b2" target="B2Component"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b component value</property>
-    </component>
-    
-    <component name="B2Component">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b2 component value</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_duplicate_property.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
deleted file mode 100644
index 0886c94a90..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
+++ /dev/null
@@ -1,35 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-Composite">
-    
- 	<component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceAImpl"/>
-	    
-	    <property name="strProperty">value1</property>
-	    <property name="strProperty">value2</property>
-	    	    
-	    
-     </component>
-     
-     
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_1.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_1.composite
deleted file mode 100644
index 5e975e5105..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_1.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceAImpl"/>
-	    
-	    <property name="strProperty">I am a string</property>
-	    <property name="objProperty">I am a object</property>	    
-	    
-     </component>
-     
-     <component name="BComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceBImpl"/>
-	    <property name="strProperty" type="xsd:string">
-	       <value>I am a string</value>
-	    </property>
-	    <!--
-	    <property name="intProperty" value="100" type="xsd:int"/>
-	    -->
-	    
-	    <property name="objProperty" value="I am a object"/>
-	     
-     </component>
-
-   
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_2.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_2.composite
deleted file mode 100644
index 42d7234a1c..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_2.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-
-	<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://www.example.com/Customer" targetNamespace="http://www.example.com/Customer">
-
-    <xsd:element name="customer" type="Customer"/>
-    <xsd:complexType name="Customer">
-        <xsd:sequence>
-            <xsd:element name="firstName"  type="xsd:string"/>
-            <xsd:element name="middleName" type="xsd:string"/>
-            <xsd:element name="lastName"   type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-   </xsd:schema>
- 
-    <component name="CComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceCImpl"/>
-	    <!--
-	    <property name="customerInfo" xsi:type="Customer">
-	    
-		    <firstName>Ku</firstName>
-		    <middleName>Jun</middleName>
-		    <lastName>Guo</lastName>
-	    
-	    </property>	  
-	    -->  
-	    
-     </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_3.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_3.composite
deleted file mode 100644
index c6b0d2f245..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/component_property_3.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-   
- 
-    <component name="CComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceCImpl"/>
-	    
-	    <property name="strProperty">
-	    	I am a string
-	    </property>	  
-	    <property name="objectProperty">
-	    	I am an object
-	    </property>	
-	    
-     </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniquename.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniquename.composite
deleted file mode 100644
index 3019542091..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniquename.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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-non-unique-name--Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/>
-     </component>
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
deleted file mode 100644
index 0f859f908f..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
+++ /dev/null
@@ -1,29 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-
-    <component name="ABComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.ABServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
deleted file mode 100644
index 00f3d00a2d..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-servicewithinterface-Composite">
-
-	
-    <component name="CDComponent">
-    
-    	<implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.CServiceImpl"/>
-    	
-        <service name="CServiceImpl">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.CService"/>           
-        </service>  
-        
-        
-        <service name="CServiceImpl">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/>
-           
-        </service>
-        
-        
-       
-        
-        
-    </component>
-    
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
deleted file mode 100644
index b4d2abc011..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-servicewithinterface-Composite">
-
-    <component name="EEComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.EServiceImpl"/>
-        
-        
-        <service name="EEService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.EEService"/>
-           
-        </service>
-        
-        
-        
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/notmatchofservicename.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
deleted file mode 100644
index 3f57e56cf5..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/notmatchofservicename.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-servicewithinterface-Composite">
-
-    <component name="DComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.DServiceImpl"/>
-                
-        <service name="DService1">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/>
-           
-        </service> 
-        
-        <service name="DService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/>
-           
-        </service>      
-        
-        
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
deleted file mode 100644
index 7cc63afee1..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
+++ /dev/null
@@ -1,32 +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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  
-  <service name="AService">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.AService"/> 
-  </service>
-
-  <service name="AService">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.BService"/> 
-  </service>
- 
-
-</componentType>              
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
deleted file mode 100644
index 899f84b2dd..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.DServiceImpl"/>
-  
-  <service name="DService">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/> 
-  </service> 
-  
-
- 
-
-</componentType>              
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
deleted file mode 100644
index 86a7be9cc0..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.EServiceImpl"/>
-  
-  <service name="EEService">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.EService"/> 
-  </service>
-  
-
- 
-
-</componentType>              
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
deleted file mode 100644
index 09cf5881a2..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
+++ /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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-
-  <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.FServiceImpl"/>
-  
-  <service name="FService1">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
-     <binding.ws uri="http://localhost:8085/FService1"/>
-  </service>
-  
-  <service name="FService2">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
-     
-  </service> 
-  
-  <service name="FService3">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/>
-     <binding.ws uri="http://localhost:8085/FService4"/> 
-  </service> 
-
- 
-
-</componentType>              
\ No newline at end of file
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
deleted file mode 100644
index 396aa0557c..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component">
-
-	
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientBImpl"/>
-        
-        <service name="MyClientB">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientB"/>          
-        </service>        
-        
-        <reference name="myservices1" target="ServiceComponent1/MyService ServiceComponent2/MyService" 
-            multiplicity="1..1">
-        </reference> 
-        
-        <reference name="myservices2" target="ServiceComponent1/MyService ServiceComponent2/MyService" 
-            multiplicity="0..1">
-        </reference> 
-        
-    </component>
-    
-    
-        
-    <component name="ServiceComponent1">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>   
-    
-    <component name="ServiceComponent2">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl2"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>  
-    
-
-</composite>
-
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
deleted file mode 100644
index 7cf1d0b2e8..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component">
-
-	<component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientEImpl"/>
-        
-        <service name="MyClientE">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientE"/>          
-        </service>
-        
-        <reference name="myservices" multiplicity="0..n" target="ServiceComponent/MyService ServiceComponent2/MyService">
-        </reference>       
-        
-        <reference name="myservice" multiplicity="1..n" target="ServiceComponent/MyService">
-        </reference>
-        
-    </component>   
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>   
-    
-    <component name="ServiceComponent2">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl2"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>  
-    
-
-</composite>
-
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
deleted file mode 100644
index eb4c820ca0..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component">
-
-	<component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientDImpl"/>
-        
-        <service name="MyClientD">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientD"/>          
-        </service>        
-        
-        <reference name="service1" multiplicity="1..n">
-        </reference>       
-        
-        <reference name="service2" multiplicity="1..1">
-        </reference>
-        
-        <reference name="service3" multiplicity="1..n" target="ServiceComponent/MyService">
-        </reference>       
-        
-        <reference name="service4" multiplicity="1..1" target="ServiceComponent/MyService">
-        </reference>
-        
-    </component>
-    
-    
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>   
-    
-
-</composite>
-
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
deleted file mode 100644
index 0895f2b7ce..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component">
-
-	<component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientCImpl"/>
-        
-        <service name="MyClientC">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientC"/>          
-        </service>        
-        
-        <reference name="service1" multiplicity="0..1">
-        </reference>       
-        
-        <reference name="service2" multiplicity="0..n"> 
-        </reference>
-        
-    </component>
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>   
-    
-
-</composite>
-
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
deleted file mode 100644
index e5e492f34b..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
-        
-        <service name="MyClientA">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>          
-        </service>        
-        
-        <reference name="b" target="ServiceComponent/MyService" wiredByImpl="true">       
-        </reference>
-        
-        <reference name="bService" target="ServiceComponent/MyService">       
-        </reference>
-        
-        
-    </component>
-    
-     
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>
-    
-    
-    
-    
-    
-    
-    
-
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename.composite
deleted file mode 100644
index 9544c947d1..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component">
-
-    <component name="ClientComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
-        
-        <service name="MyClientA">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>          
-        </service>
-        
-        <reference name="b" target="ServiceComponent/MyService">       
-        </reference>
-        
-        <reference name="bService" target="ServiceComponent/MyService">
-        </reference>
-        
-    </component> 
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_1.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_1.composite
deleted file mode 100644
index e7445c4a2a..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_1.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-reference">
-
-    <component name="ClientComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
-        
-        <service name="MyClientA">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>          
-        </service>
-        
-        <reference name="b" target="ServiceComponent/MyService">       
-        </reference>
-        
-        <reference name="bService" target="ServiceComponent/MyService">
-        </reference>
-        
-    </component>
-    
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_2.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_2.composite
deleted file mode 100644
index bf39310764..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_2.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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-reference">
-
-    
-    
-    <component name="ClientComponent2">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
-        
-        <service name="MyClientA">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>         
-        </service>
-        
-        <reference name="b" target="ServiceComponent/MyService">
-        </reference>
-        
-        <reference name="b" target="ServiceComponent/MyService"> 
-        </reference>
-        
-    </component>   
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_3.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_3.composite
deleted file mode 100644
index e2ef1947e8..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_3.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.
--->
-<!--to test the reference name matched with implementation-->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-reference">
-
-
-    <component name="ClientComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
-        
-        <service name="MyClientA">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>          
-        </service>
-        
-        <reference name="b" target="ServiceComponent/MyService">       
-        </reference>
-        
-        <reference name="bService" target="ServiceComponent/MyService">
-        </reference>
-        
-    </component>    
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_4.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_4.composite
deleted file mode 100644
index 5ef8367193..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/referencename_4.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.
--->
-<!--to test the reference name not matched with implementation-->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-reference">
-
-
-    <component name="ClientComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
-        
-        <service name="MyClientA">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>          
-        </service>
-        
-        <reference name="bb" target="ServiceComponent/MyService">       
-        </reference>
-        
-        <reference name="bService" target="ServiceComponent/MyService">
-        </reference>
-        
-    </component>
-    
-    
-        
-    <component name="ServiceComponent">        
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
-		<service name="MyService">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>           
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/serviceelement.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/serviceelement.composite
deleted file mode 100644
index 9460f5a2e1..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/serviceelement.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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/>
-	    <reference name="b" target="BComponent"/>
-	    <reference name="b2" target="B2Component"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b component value</property>
-        <service name="BService"/>
-    </component>
-    
-    <component name="B2Component">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b2 component value</property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/servicewithbinding.composite
deleted file mode 100644
index 085d84f40e..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/servicewithbinding.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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-servicewithbinding-Composite">
-
-    <component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.CServiceImpl"/>
-        <service name="CServiceImpl">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.CService"/>
-           <binding.sca/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/servicewithinterface.composite
deleted file mode 100644
index cc915fbde5..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ /dev/null
@@ -1,32 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-servicewithinterface-Composite">
-
-    <component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.CServiceImpl"/>
-        <service name="CServiceImpl">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.CService"/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/zerocomponents.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/zerocomponents.composite
deleted file mode 100644
index 9465cedaf9..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ /dev/null
@@ -1,25 +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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-zero-components-Composite">
-    
-</composite>
diff --git a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/zeroimplelements.composite
deleted file mode 100644
index 8629f3817a..0000000000
--- a/tags/java/sca/1.5.1/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-zeroimplelements-Composite">
-
-    <component name="AComponent">
-    </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b component value</property>
-    </component>
-    
-    <component name="B2Component">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b2 component value</property>
-    </component>
-    
-</composite>
-- 
cgit v1.2.3