From ebb89430400c2cb1d1c74ca18927375ff41601cc Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 5 Feb 2009 07:55:03 +0000
Subject: Move the contrib folder out of the sca trunk build as discussed on
 the ML

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741038 13f79535-47bb-0310-9956-ffa450edef68
---
 .../scenario1/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario1/scenario1.composite   | 45 ---------------
 .../main/resources/scenario1/scenario1a.composite  | 47 ----------------
 .../scenario10/META-INF/sca-contribution.xml       | 24 --------
 .../main/resources/scenario10/scenario10.composite | 62 ---------------------
 .../resources/scenario10/scenario10a.composite     | 61 ---------------------
 .../src/main/resources/scenario10/service3.wsdl    | 63 ---------------------
 .../scenario11/META-INF/sca-contribution.xml       | 24 --------
 .../main/resources/scenario11/scenario11.composite | 59 --------------------
 .../resources/scenario11/scenario11a.composite     | 64 ----------------------
 .../src/main/resources/scenario11/service3.wsdl    | 63 ---------------------
 .../scenario12/META-INF/sca-contribution.xml       | 24 --------
 .../main/resources/scenario12/scenario12.composite | 58 --------------------
 .../resources/scenario12/scenario12a.composite     | 64 ----------------------
 .../scenario13/META-INF/sca-contribution.xml       | 24 --------
 .../main/resources/scenario13/scenario13.composite | 58 --------------------
 .../resources/scenario13/scenario13a.composite     | 64 ----------------------
 .../scenario2/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario2/scenario2.composite   | 45 ---------------
 .../main/resources/scenario2/scenario2a.composite  | 47 ----------------
 .../scenario3/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario3/scenario3.composite   | 44 ---------------
 .../main/resources/scenario3/scenario3a.composite  | 48 ----------------
 .../scenario4/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario4/scenario4.composite   | 44 ---------------
 .../main/resources/scenario4/scenario4a.composite  | 48 ----------------
 .../scenario5/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario5/scenario5.composite   | 46 ----------------
 .../main/resources/scenario5/scenario5a.composite  | 47 ----------------
 .../src/main/resources/scenario5/scenarios.wsdl    | 63 ---------------------
 .../scenario6/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario6/scenario6.composite   | 47 ----------------
 .../main/resources/scenario6/scenario6a.composite  | 47 ----------------
 .../src/main/resources/scenario6/scenarios.wsdl    | 63 ---------------------
 .../scenario7/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario7/scenario7.composite   | 45 ---------------
 .../main/resources/scenario7/scenario7a.composite  | 49 -----------------
 .../src/main/resources/scenario7/scenarios.wsdl    | 63 ---------------------
 .../scenario8/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario8/scenario8.composite   | 44 ---------------
 .../main/resources/scenario8/scenario8a.composite  | 50 -----------------
 .../src/main/resources/scenario8/scenarios.wsdl    | 63 ---------------------
 .../scenario9/META-INF/sca-contribution.xml        | 24 --------
 .../main/resources/scenario9/scenario9.composite   | 60 --------------------
 .../main/resources/scenario9/scenario9a.composite  | 61 ---------------------
 45 files changed, 2044 deletions(-)
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario1/scenario1.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario10/scenario10.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario10/service3.wsdl
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario11/scenario11.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario11/service3.wsdl
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario12/scenario12.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario13/scenario13.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario2/scenario2.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario3/scenario3.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario4/scenario4.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario5/scenario5.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario6/scenario6.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario7/scenario7.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario8/scenario8.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario9/scenario9.composite
 delete mode 100644 java/sca/contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite

(limited to 'java/sca/contrib/itest/builder/src/main/resources')

diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
deleted file mode 100644
index 256d01be58..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario1"
-              xmlns:ns1="http://scenario1">
-    <deployable composite="ns1:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario1/scenario1.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario1/scenario1.composite
deleted file mode 100644
index 5c2a98ab40..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario1/scenario1.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario1"
-        xmlns:tns="http://scenario1"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <binding.ws />
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite
deleted file mode 100644
index 21b5897aa1..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario1/scenario1a.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"
-        targetNamespace="http://scenario1"
-        xmlns:tns="http://scenario1"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
deleted file mode 100644
index 083079ba42..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario10"
-              xmlns:ns10="http://scenario10">
-   <deployable composite="ns10:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario10/scenario10.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario10/scenario10.composite
deleted file mode 100644
index c24b7f0046..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario10/scenario10.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"
-        targetNamespace="http://scenario10"
-        xmlns:tns="http://scenario10"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-    <reference name="reference1a" promote="ComponentB/reference2a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>    
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
-        </service>
-        <reference name="reference2" target="ComponentB/Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws />
-        </reference>
-        <reference name="reference2a" target="ComponentF">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
-            <binding.ws />
-        </reference>        
-    </component>
-    
-    <component name="ComponentF">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>            
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite
deleted file mode 100644
index 27a73d5c41..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario10/scenario10a.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario10"
-        xmlns:tns="http://scenario10"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-    <reference name="reference2a" promote="ComponentD/reference3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>    
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3" target="ComponentD/Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-        <reference name="reference3a" target="ComponentE">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>        
-    </component>
-    
-    <component name="ComponentE">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>    
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario10/service3.wsdl b/java/sca/contrib/itest/builder/src/main/resources/scenario10/service3.wsdl
deleted file mode 100644
index 14edcc00e6..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ /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.    
--->
-<wsdl:definitions name="Service3Service"
-                  targetNamespace="http://scenarios"
-                  xmlns:tns="http://scenarios"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-  <wsdl:types>
-    <xs:schema attributeFormDefault="qualified"
-               elementFormDefault="unqualified"
-               targetNamespace="http://scenarios"
-               xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="getGreetings">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="getGreetingsResponse">
-        <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="getGreetings">
-    <wsdl:part name="getGreetings" element="tns:getGreetings" />
-  </wsdl:message>
-
-  <wsdl:message name="getGreetingsResponse">
-    <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse" />
-  </wsdl:message>
-
-  <wsdl:portType name="Service3">
-    <wsdl:operation name="getGreetings">
-      <wsdl:input message="tns:getGreetings" />
-      <wsdl:output message="tns:getGreetingsResponse" />
-    </wsdl:operation>
-  </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
deleted file mode 100644
index a6e4b65970..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario11"
-              xmlns:ns11="http://scenario11">
-   <deployable composite="ns11:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario11/scenario11.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario11/scenario11.composite
deleted file mode 100644
index 3a94152e6a..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario11/scenario11.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"
-        targetNamespace="http://scenario11"
-        xmlns:tns="http://scenario11"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-    <reference name="reference1a" promote="ComponentB/reference2a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>    
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-        <reference name="reference2a" target="ComponentF">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>        
-    </component>
-    
-    <component name="ComponentF">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>            
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite
deleted file mode 100644
index 6130c68651..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario11/scenario11a.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario11"
-        xmlns:tns="http://scenario11"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <binding.ws />
-    </reference>
-    <reference name="reference2a" promote="ComponentD/reference3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
-        <binding.ws />
-    </reference>    
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3" target="ComponentD/Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-        <reference name="reference3a" target="ComponentE">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>        
-    </component>
-    
-    <component name="ComponentE">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>    
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario11/service3.wsdl b/java/sca/contrib/itest/builder/src/main/resources/scenario11/service3.wsdl
deleted file mode 100644
index 14edcc00e6..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ /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.    
--->
-<wsdl:definitions name="Service3Service"
-                  targetNamespace="http://scenarios"
-                  xmlns:tns="http://scenarios"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-  <wsdl:types>
-    <xs:schema attributeFormDefault="qualified"
-               elementFormDefault="unqualified"
-               targetNamespace="http://scenarios"
-               xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="getGreetings">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="getGreetingsResponse">
-        <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="getGreetings">
-    <wsdl:part name="getGreetings" element="tns:getGreetings" />
-  </wsdl:message>
-
-  <wsdl:message name="getGreetingsResponse">
-    <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse" />
-  </wsdl:message>
-
-  <wsdl:portType name="Service3">
-    <wsdl:operation name="getGreetings">
-      <wsdl:input message="tns:getGreetings" />
-      <wsdl:output message="tns:getGreetingsResponse" />
-    </wsdl:operation>
-  </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
deleted file mode 100644
index 125bdc5e53..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario12"
-              xmlns:ns12="http://scenario12">
-   <deployable composite="ns12:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario12/scenario12.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario12/scenario12.composite
deleted file mode 100644
index aabd445e23..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario12/scenario12.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"
-        targetNamespace="http://scenario12"
-        xmlns:tns="http://scenario12"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-    <reference name="reference1a" promote="ComponentB/reference2a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>    
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-        <reference name="reference2a" target="ComponentF">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>        
-    </component>
-    
-    <component name="ComponentF">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>            
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite
deleted file mode 100644
index a2ccc47c28..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario12/scenario12a.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario12"
-        xmlns:tns="http://scenario12"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-    <reference name="reference2a" promote="ComponentD/reference3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>    
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
-        </service>
-        <reference name="reference3" target="ComponentD/Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws/>
-        </reference>
-        <reference name="reference3a" target="ComponentE">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws />
-        </reference>        
-    </component>
-    
-    <component name="ComponentE">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>    
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
deleted file mode 100644
index c906c6c5b0..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario13"
-              xmlns:ns13="http://scenario13">
-   <deployable composite="ns13:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario13/scenario13.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario13/scenario13.composite
deleted file mode 100644
index ed59cd2adf..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario13/scenario13.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"
-        targetNamespace="http://scenario13"
-        xmlns:tns="http://scenario13"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-    <reference name="reference1a" promote="ComponentB/reference2a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>    
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-        <reference name="reference2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>        
-    </component>
-    
-    <component name="ComponentF">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>            
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite
deleted file mode 100644
index 41150f78fd..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario13/scenario13a.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario13"
-        xmlns:tns="http://scenario13"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-    <reference name="reference2a" promote="ComponentD/reference3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>    
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
-        </service>
-        <reference name="reference3" target="ComponentD/Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws/>
-        </reference>
-        <reference name="reference3a" target="ComponentE">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws />
-        </reference>        
-    </component>
-    
-    <component name="ComponentE">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>    
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
deleted file mode 100644
index 6fa901c4df..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario2"
-              xmlns:ns2="http://scenario2">
-    <deployable composite="ns2:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario2/scenario2.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario2/scenario2.composite
deleted file mode 100644
index 66f88294ff..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario2/scenario2.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario2"
-        xmlns:tns="http://scenario2"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws />
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite
deleted file mode 100644
index db1af4743f..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario2/scenario2a.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"
-        targetNamespace="http://scenario2"
-        xmlns:tns="http://scenario2"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
deleted file mode 100644
index f5899ab1f0..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario3"
-              xmlns:ns3="http://scenario3">
-    <deployable composite="ns3:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario3/scenario3.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario3/scenario3.composite
deleted file mode 100644
index 4b37c19e4e..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario3"
-        xmlns:tns="http://scenario3"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite
deleted file mode 100644
index fedd79ff3d..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario3/scenario3a.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"
-        targetNamespace="http://scenario3"
-        xmlns:tns="http://scenario3"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <binding.ws />
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
deleted file mode 100644
index 642245ea7e..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario4"
-              xmlns:ns4="http://scenario4">
-   <deployable composite="ns4:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario4/scenario4.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario4/scenario4.composite
deleted file mode 100644
index 1bb876b33d..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario4"
-        xmlns:tns="http://scenario4"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite
deleted file mode 100644
index 55e13700a6..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario4/scenario4a.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"
-        targetNamespace="http://scenario4"
-        xmlns:tns="http://scenario4"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws />
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
deleted file mode 100644
index 92da17179f..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario5"
-              xmlns:ns5="http://scenario5">
-   <deployable composite="ns5:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenario5.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenario5.composite
deleted file mode 100644
index 403e19b087..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenario5.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario5"
-        xmlns:tns="http://scenario5"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />
-        <binding.ws uri="http://foo.com/bar" />
-    </reference>
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite
deleted file mode 100644
index 0e37ded0e4..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenario5a.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"
-        targetNamespace="http://scenario5"
-        xmlns:tns="http://scenario5"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ /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.    
--->
-<wsdl:definitions name="Service3Service"
-                  targetNamespace="http://scenarios"
-                  xmlns:tns="http://scenarios"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-  <wsdl:types>
-    <xs:schema attributeFormDefault="qualified"
-               elementFormDefault="unqualified"
-               targetNamespace="http://scenarios"
-               xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="getGreetings2">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="getGreetings2Response">
-        <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="getGreetings2">
-    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />
-  </wsdl:message>
-
-  <wsdl:message name="getGreetings2Response">
-    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />
-  </wsdl:message>
-
-  <wsdl:portType name="Service3a">
-    <wsdl:operation name="getGreetings2">
-      <wsdl:input message="tns:getGreetings2" />
-      <wsdl:output message="tns:getGreetings2Response" />
-    </wsdl:operation>
-  </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
deleted file mode 100644
index 42d45b0b98..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario6"
-              xmlns:ns6="http://scenario6">
-   <deployable composite="ns6:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenario6.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenario6.composite
deleted file mode 100644
index 1c89139905..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenario6.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"
-        targetNamespace="http://scenario6"
-        xmlns:tns="http://scenario6"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
-        </service>
-        <reference name="reference2" target="ComponentB/Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />
-            <binding.ws />
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite
deleted file mode 100644
index 853703a353..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenario6a.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"
-        targetNamespace="http://scenario6"
-        xmlns:tns="http://scenario6"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ /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.    
--->
-<wsdl:definitions name="Service3Service"
-                  targetNamespace="http://scenarios"
-                  xmlns:tns="http://scenarios"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-  <wsdl:types>
-    <xs:schema attributeFormDefault="qualified"
-               elementFormDefault="unqualified"
-               targetNamespace="http://scenarios"
-               xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="getGreetings2">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="getGreetings2Response">
-        <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="getGreetings2">
-    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />
-  </wsdl:message>
-
-  <wsdl:message name="getGreetings2Response">
-    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />
-  </wsdl:message>
-
-  <wsdl:portType name="Service3a">
-    <wsdl:operation name="getGreetings2">
-      <wsdl:input message="tns:getGreetings2" />
-      <wsdl:output message="tns:getGreetings2Response" />
-    </wsdl:operation>
-  </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
deleted file mode 100644
index 44c471cc65..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario7"
-              xmlns:ns7="http://scenario7">
-   <deployable composite="ns7:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenario7.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenario7.composite
deleted file mode 100644
index 6b1ac24cec..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenario7.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario7"
-        xmlns:tns="http://scenario7"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite
deleted file mode 100644
index 8e0cebbdd5..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenario7a.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"
-        targetNamespace="http://scenario7"
-        xmlns:tns="http://scenario7"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />
-        <binding.ws />
-    </reference>
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ /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.    
--->
-<wsdl:definitions name="Service3Service"
-                  targetNamespace="http://scenarios"
-                  xmlns:tns="http://scenarios"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-  <wsdl:types>
-    <xs:schema attributeFormDefault="qualified"
-               elementFormDefault="unqualified"
-               targetNamespace="http://scenarios"
-               xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="getGreetings2">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="getGreetings2Response">
-        <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="getGreetings2">
-    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />
-  </wsdl:message>
-
-  <wsdl:message name="getGreetings2Response">
-    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />
-  </wsdl:message>
-
-  <wsdl:portType name="Service3a">
-    <wsdl:operation name="getGreetings2">
-      <wsdl:input message="tns:getGreetings2" />
-      <wsdl:output message="tns:getGreetings2Response" />
-    </wsdl:operation>
-  </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
deleted file mode 100644
index 7cb09d0a74..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario8"
-              xmlns:ns8="http://scenario8">
-   <deployable composite="ns8:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenario8.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenario8.composite
deleted file mode 100644
index 26e5ee33fa..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario8"
-        xmlns:tns="http://scenario8"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite
deleted file mode 100644
index 4fa0712199..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenario8a.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"
-        targetNamespace="http://scenario8"
-        xmlns:tns="http://scenario8"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <binding.ws uri="http://foo.com/bar" />
-        </service>
-        <reference name="reference3" target="ComponentD/Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />
-            <binding.ws />
-        </reference>
-    </component>
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ /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.    
--->
-<wsdl:definitions name="Service3Service"
-                  targetNamespace="http://scenarios"
-                  xmlns:tns="http://scenarios"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-  <wsdl:types>
-    <xs:schema attributeFormDefault="qualified"
-               elementFormDefault="unqualified"
-               targetNamespace="http://scenarios"
-               xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="getGreetings2">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="getGreetings2Response">
-        <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="getGreetings2">
-    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />
-  </wsdl:message>
-
-  <wsdl:message name="getGreetings2Response">
-    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />
-  </wsdl:message>
-
-  <wsdl:portType name="Service3a">
-    <wsdl:operation name="getGreetings2">
-      <wsdl:input message="tns:getGreetings2" />
-      <wsdl:output message="tns:getGreetings2Response" />
-    </wsdl:operation>
-  </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/java/sca/contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
deleted file mode 100644
index 6e0908702b..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://scenario9"
-              xmlns:ns9="http://scenario9">
-   <deployable composite="ns9:CompositeA" />
-</contribution>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario9/scenario9.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario9/scenario9.composite
deleted file mode 100644
index 3fce35470e..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario9/scenario9.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario9"
-        xmlns:tns="http://scenario9"
-        name="CompositeA">
-
-    <service name="Service1" promote="ComponentB/Service2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference1" promote="ComponentB/reference2">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <binding.ws uri="http://foo.com/bar"/>
-    </reference>
-    <reference name="reference1a" promote="ComponentB/reference2a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        <binding.ws uri="http://foo.com/bar"/>
-    </reference>    
-
-    <component name="ComponentB">
-        <implementation.composite name="tns:CompositeC" />
-        <service name="Service2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference2">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-        <reference name="reference2a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>        
-    </component>
-    
-    <component name="ComponentF">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>            
-</composite>
diff --git a/java/sca/contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite b/java/sca/contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite
deleted file mode 100644
index 6e86c547b3..0000000000
--- a/java/sca/contrib/itest/builder/src/main/resources/scenario9/scenario9a.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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://scenario9"
-        xmlns:tns="http://scenario9"
-        name="CompositeC">
-
-    <service name="Service2" promote="ComponentD/Service3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <service name="Service2a" promote="ComponentD/Service3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </service>
-    <reference name="reference2" promote="ComponentD/reference3">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>
-    <reference name="reference2a" promote="ComponentD/reference3a">
-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-    </reference>    
-
-    <component name="ComponentD">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>
-        <service name="Service3">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <service name="Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </service>
-        <reference name="reference3" target="ComponentD/Service3a">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>
-        <reference name="reference3a" target="ComponentE">
-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->
-        </reference>        
-    </component>
-    
-    <component name="ComponentE">
-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>
-        <service name="Service3">
-            <binding.sca />
-            <binding.ws />
-        </service>
-    </component>    
-</composite>
-- 
cgit v1.2.3