Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835129 13f79535-47bb-0310-9956-ffa450edef68
author: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2009-11-11 23:08:11 +0000
committer: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2009-11-11 23:08:11 +0000
commit: 0cc8ed2208c9d04057bcb00859490290e3aa948c (patch)
tree: 0087418cfdfc40a85fc250a9c36cb8ddc0ebb5db /sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src
parent: e0ff67c0b32813ea48734c770a5ffc1952644e29 (diff)
55 files changed, 3669 insertions, 0 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
new file mode 100644
index 0000000000..932ae3987a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import java.util.List;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * Implementation class for ComponentD.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(interfaces={Service3.class, Service3a.class})
+public class ComponentDImpl implements Service3, Service3a {
+
+    @Reference
+    protected Service3a reference3;
+
+    public String getGreetings(String name) {
+        return "Hello, " + name + "!";
+    }
+
+    public String getGreetings2(String name) {
+        return "Goodbye, " + name + "!";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
new file mode 100644
index 0000000000..fbb10a9ff7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import java.util.List;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * Implementation class for ComponentD.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(interfaces={Service3.class, Service3a.class})
+public class ComponentDReferenceMultiplicityImpl implements Service3, Service3a {
+
+    @Reference
+    protected Service3a reference3;
+    
+    @Reference
+    protected List<Service3> reference3a;
+
+    public String getGreetings(String name) {
+        return "Hello, " + name + "!";
+    }
+
+    public String getGreetings2(String name) {
+        return "Goodbye, " + name + "!";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
new file mode 100644
index 0000000000..d1db4a5620
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * Implementation class for ComponentD.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(interfaces={Service3.class})
+public class ComponentEImpl implements Service3 {
+
+
+    public String getGreetings(String name) {
+        return "Hello, " + name + " from ComponentE";
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
new file mode 100644
index 0000000000..c6d1240a95
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * Implementation class for ComponentD.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(interfaces={Service3.class})
+public class ComponentFImpl implements Service3 {
+
+
+    public String getGreetings(String name) {
+        return "Hello, " + name + " from ComponentF";
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
new file mode 100644
index 0000000000..9a775feec9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Interface for Service3 in ComponentD.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface Service3 {
+
+    String getGreetings(String name);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
new file mode 100644
index 0000000000..98a1741fb6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Interface for Service3a in ComponentD.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface Service3a {
+
+    String getGreetings2(String name);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..256d01be58
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/scenario1.composite
new file mode 100644
index 0000000000..5c2a98ab40
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/scenario1.composite
@@ -0,0 +1,45 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/scenario1a.composite
new file mode 100644
index 0000000000..21b5897aa1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario1/scenario1a.composite
@@ -0,0 +1,47 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..ac01b3c687
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/scenario10.composite
new file mode 100644
index 0000000000..2d127a7bec
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/scenario10.composite
@@ -0,0 +1,62 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/scenario10a.composite
new file mode 100644
index 0000000000..98103e360e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/scenario10a.composite
@@ -0,0 +1,61 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/service3.wsdl
new file mode 100644
index 0000000000..14edcc00e6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario10/service3.wsdl
@@ -0,0 +1,63 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8b82b43c68
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/scenario11.composite
new file mode 100644
index 0000000000..2f5ca96d07
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/scenario11.composite
@@ -0,0 +1,59 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/scenario11a.composite
new file mode 100644
index 0000000000..381ccddcc3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/scenario11a.composite
@@ -0,0 +1,64 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/service3.wsdl
new file mode 100644
index 0000000000..14edcc00e6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario11/service3.wsdl
@@ -0,0 +1,63 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..4028098023
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/scenario12.composite
new file mode 100644
index 0000000000..23799f8487
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/scenario12.composite
@@ -0,0 +1,58 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/scenario12a.composite
new file mode 100644
index 0000000000..a2b4f88dc3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario12/scenario12a.composite
@@ -0,0 +1,64 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..c906c6c5b0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/scenario13.composite
new file mode 100644
index 0000000000..ed59cd2adf
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/scenario13.composite
@@ -0,0 +1,58 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/scenario13a.composite
new file mode 100644
index 0000000000..41150f78fd
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario13/scenario13a.composite
@@ -0,0 +1,64 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..6fa901c4df
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/scenario2.composite
new file mode 100644
index 0000000000..66f88294ff
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/scenario2.composite
@@ -0,0 +1,45 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/scenario2a.composite
new file mode 100644
index 0000000000..db1af4743f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario2/scenario2a.composite
@@ -0,0 +1,47 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..f5899ab1f0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/scenario3.composite
new file mode 100644
index 0000000000..4b37c19e4e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/scenario3.composite
@@ -0,0 +1,44 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/scenario3a.composite
new file mode 100644
index 0000000000..fedd79ff3d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario3/scenario3a.composite
@@ -0,0 +1,48 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..642245ea7e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/scenario4.composite
new file mode 100644
index 0000000000..1bb876b33d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/scenario4.composite
@@ -0,0 +1,44 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/scenario4a.composite
new file mode 100644
index 0000000000..55e13700a6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario4/scenario4a.composite
@@ -0,0 +1,48 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..92da17179f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenario5.composite
new file mode 100644
index 0000000000..403e19b087
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenario5.composite
@@ -0,0 +1,46 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenario5a.composite
new file mode 100644
index 0000000000..0e37ded0e4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenario5a.composite
@@ -0,0 +1,47 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario5/scenarios.wsdl
@@ -0,0 +1,63 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..42d45b0b98
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenario6.composite
new file mode 100644
index 0000000000..1c89139905
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenario6.composite
@@ -0,0 +1,47 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenario6a.composite
new file mode 100644
index 0000000000..853703a353
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenario6a.composite
@@ -0,0 +1,47 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario6/scenarios.wsdl
@@ -0,0 +1,63 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..44c471cc65
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenario7.composite
new file mode 100644
index 0000000000..6b1ac24cec
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenario7.composite
@@ -0,0 +1,45 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenario7a.composite
new file mode 100644
index 0000000000..8e0cebbdd5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenario7a.composite
@@ -0,0 +1,49 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario7/scenarios.wsdl
@@ -0,0 +1,63 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..7cb09d0a74
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenario8.composite
new file mode 100644
index 0000000000..26e5ee33fa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenario8.composite
@@ -0,0 +1,44 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenario8a.composite
new file mode 100644
index 0000000000..4fa0712199
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenario8a.composite
@@ -0,0 +1,50 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario8/scenarios.wsdl
@@ -0,0 +1,63 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b6ec160506
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/scenario9.composite
new file mode 100644
index 0000000000..83584ed482
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/scenario9.composite
@@ -0,0 +1,60 @@
+<?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/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/scenario9a.composite
new file mode 100644
index 0000000000..0021ec242b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/main/resources/scenario9/scenario9a.composite
@@ -0,0 +1,61 @@
+<?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>
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
new file mode 100644
index 0000000000..1f45cb4a66
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
@@ -0,0 +1,805 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.xml.namespace.QName;
+import junit.framework.TestCase;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.SCABinding;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
+
+/**
+ * Load and build some composites and inspect the results.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class BuilderTestCase extends TestCase {
+    private CustomCompositeBuilder customBuilder;
+    
+    @Override
+    protected void setUp() throws Exception {
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+    }
+
+
+    // Scenario 1: <binding.ws> on outer composite service CompositeA/Service1
+    public void testScenario1() throws Exception {
+        System.out.println("====>Running testScenario1");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario1Results(false);
+    }
+
+    public void testScenario1NonWiring() throws Exception {
+        System.out.println("====>Running testScenario1NonWiring");
+        customBuilder = new CustomCompositeBuilder(true);
+        customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario1Results(true);
+    }
+
+    private void checkScenario1Results(boolean nonWiring) {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        if (!nonWiring) {
+            // Should create component service $promoted$Service1 on innermost component
+            //  ComponentD, with <binding.ws> and uri="/Service1"
+            // No other services on ComponentD should have <binding.ws>
+            WebServiceBinding wsBinding = null;
+            for (ComponentService service : componentD.getServices()) {
+                WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);
+                if ("$promoted$Service1".equals(service.getName())) {
+                    wsBinding = wsb;
+                } else {
+                    assert wsb == null;
+                }
+            }
+            assert "/Service1".equals(wsBinding.getURI());
+
+            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"
+            Definition def = wsBinding.getWSDLDocument();
+            javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 
+            Port port = svc.getPort("Service3Port");
+            assert "/Service1".equals(TestUtils.getPortAddress(port));
+        } else {
+            // Should not create component service $promoted$Service1 on innermost component ComponentD
+            // No component services on ComponentD should have <binding.ws>
+            for (ComponentService service : componentD.getServices()) {
+                assert !"$promoted$Service1".equals(service.getName());
+                assert service.getBinding(WebServiceBinding.class) == null;
+            }
+        }
+
+        // No services on ComponentB should have <binding.ws>
+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");
+        for (ComponentService service : componentB.getServices()) {
+            assert service.getBinding(WebServiceBinding.class) == null;
+        }
+
+        // No services on CompositeC should have <binding.ws>
+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario1", "CompositeC"));
+        for (Service service : compositeC.getServices()) {
+            assert service.getBinding(WebServiceBinding.class) == null;
+        }
+
+        if (nonWiring) {
+            // Should not add a WSDL document to domain composite service Service1
+            WebServiceBinding wsBinding = null;
+            for (Service service : domainComposite.getServices()) {
+                if ("Service1".equals(service.getName())) {
+                    wsBinding = service.getBinding(WebServiceBinding.class);
+                }
+            }
+            assert wsBinding.getWSDLDocument() == null;
+        }
+    }
+
+    // Scenario 2: <binding.ws> on outer component service ComponentB/Service2
+    public void testScenario2() throws Exception {
+        System.out.println("====>Running testScenario2");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario2and3Results("http://scenario2", false);
+    }
+
+    public void testScenario2NonWiring() throws Exception {
+        System.out.println("====>Running testScenario2NonWiring");
+        customBuilder = new CustomCompositeBuilder(true);
+        customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario2and3Results("http://scenario2", true);
+    }
+
+    private void checkScenario2and3Results(String namespace, boolean nonWiring) {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2"
+        // No other services on ComponentB should have <binding.ws>
+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");
+        WebServiceBinding wsBinding = null;
+        for (ComponentService service : componentB.getServices()) {
+            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);
+            if ("Service2".equals(service.getName())) {
+                wsBinding = wsb;
+            } else {
+                assert wsb == null;
+            }
+        }
+        Definition def = wsBinding.getWSDLDocument();
+        javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 
+        Port port = svc.getPort("Service3Port");
+        assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
+
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        if (!nonWiring) {
+            // Should create component service $promoted$ComponentB$slash$Service2 on innermost component
+            //  ComponentD, with <binding.ws> and uri="/ComponentB/Service2"
+            wsBinding = null;
+            for (ComponentService service : componentD.getServices()) {
+                if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) {
+                    wsBinding = service.getBinding(WebServiceBinding.class);
+                }
+            }
+            assert "/ComponentB/Service2".equals(wsBinding.getURI());
+
+            // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2"
+            def = wsBinding.getWSDLDocument();
+            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 
+            port = svc.getPort("Service3Port");
+            assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
+        } else {
+            // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD
+            for (ComponentService service : componentD.getServices()) {
+                assert !"$promoted$ComponentB$slash$Service2".equals(service.getName());
+            }
+        }
+
+        // Should add <binding.ws> to outer composite service CompositeA/Service1 
+        wsBinding = null;
+        for (Service service : domainComposite.getServices()) {
+            if ("Service1".equals(service.getName())) {
+                wsBinding = service.getBinding(WebServiceBinding.class);
+            }
+        }
+        assert wsBinding != null;
+        if (nonWiring) {
+            // Should not add a WSDL document to domain composite service Service1
+            assert wsBinding.getWSDLDocument() == null;
+        }
+
+        if (!nonWiring) {
+            // Should create component service $promoted$Service1 on innermost component
+            //  ComponentD, with <binding.ws> and uri="/Service1"
+            wsBinding = null;
+            for (ComponentService service : componentD.getServices()) {
+                if ("$promoted$Service1".equals(service.getName())) {
+                    wsBinding = service.getBinding(WebServiceBinding.class);
+                }
+            }
+            assert "/Service1".equals(wsBinding.getURI());
+
+            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"
+            def = wsBinding.getWSDLDocument();
+            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 
+            port = svc.getPort("Service3Port");
+            assert "/Service1".equals(TestUtils.getPortAddress(port));
+        } else {
+            // Should not create component service $promoted$.Service1 on innermost component ComponentD
+            for (ComponentService service : componentD.getServices()) {
+                assert !"$promoted$Service1".equals(service.getName());
+            }
+        }
+
+        // No services on ComponentD should have <binding.ws>, except for $promoted$Service1
+        // and $promoted$ComponentB$slash$Service2  
+        for (ComponentService service : componentD.getServices()) {
+            if (!"$promoted$Service1".equals(service.getName()) &&
+                !"$promoted$ComponentB$slash$Service2".equals(service.getName())) {
+                assert service.getBinding(WebServiceBinding.class) == null;
+            }
+        }
+
+        // No services on CompositeC should have <binding.ws>, except for Service2 in Scenario 3
+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC"));
+        for (Service service : compositeC.getServices()) {
+            if ("http://scenario3".equals(namespace) && "Service2".equals(service.getName())) {
+                assert service.getBinding(WebServiceBinding.class) != null;
+            } else {
+                assert service.getBinding(WebServiceBinding.class) == null;
+            }
+        }
+    }
+
+    // Scenario 3: <binding.ws> on inner composite service CompositeC/Service2
+    public void testScenario3() throws Exception {
+        System.out.println("====>Running testScenario3");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario2and3Results("http://scenario3", false);
+    }
+
+    public void testScenario3NonWiring() throws Exception {
+        System.out.println("====>Running testScenario3NonWiring");
+        customBuilder = new CustomCompositeBuilder(true);
+        customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario2and3Results("http://scenario3", true);
+    }
+
+    // Scenario 4: <binding.ws> on inner component service ComponentD/Service3
+    public void testScenario4() throws Exception {
+        System.out.println("====>Running testScenario4");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario4Results(false);
+    }
+
+    public void testScenario4NonWiring() throws Exception {
+        System.out.println("====>Running testScenario4NonWiring");
+        customBuilder = new CustomCompositeBuilder(true);
+        customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario4Results(true);
+    }
+
+    private void checkScenario4Results(boolean nonWiring) {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        // Should create WSDL document for ComponentD/Service3 with endpoint uri="/ComponentD/Service3"
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        WebServiceBinding wsBinding = null;
+        for (ComponentService service : componentD.getServices()) {
+            if ("Service3".equals(service.getName())) {
+                wsBinding = service.getBinding(WebServiceBinding.class);
+            }
+        }
+        Definition def = wsBinding.getWSDLDocument();
+        javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 
+        Port port = svc.getPort("Service3Port");
+        assert "/ComponentB/ComponentD/Service3".equals(TestUtils.getPortAddress(port));
+
+        // Should add <binding.ws> to inner composite service CompositeC/Service2 
+        // No other services on CompositeC should have <binding.ws>
+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario4", "CompositeC"));
+        wsBinding = null;
+        for (Service service : compositeC.getServices()) {
+            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);
+            if ("Service2".equals(service.getName())) {
+                wsBinding = wsb;
+            } else {
+                assert wsb == null;
+            }
+        }
+        assert "/ComponentB/Service2".equals(wsBinding.getURI());
+
+        // Should add <binding.ws> to outer component service ComponentB/Service2 
+        // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2"
+        // No other services on ComponentB should have <binding.ws>
+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");
+        wsBinding = null;
+        for (ComponentService service : componentB.getServices()) {
+            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);
+            if ("Service2".equals(service.getName())) {
+                wsBinding = wsb;
+            } else {
+                assert wsb == null;
+            }
+        }
+        assert "/ComponentB/Service2".equals(wsBinding.getURI());
+        def = wsBinding.getWSDLDocument();
+        svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 
+        port = svc.getPort("Service3Port");
+        assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
+
+        if (!nonWiring) {
+            // Should create component service $promoted$ComponentB$slash$Service2 on innermost component
+            //  ComponentD, with <binding.ws> and uri="/ComponentB/Service2"
+            wsBinding = null;
+            for (ComponentService service : componentD.getServices()) {
+                if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) {
+                    wsBinding = service.getBinding(WebServiceBinding.class);
+                }
+            }
+            assert "/ComponentB/Service2".equals(wsBinding.getURI());
+
+            // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2"
+            def = wsBinding.getWSDLDocument();
+            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 
+            port = svc.getPort("Service3Port");
+            assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
+        } else {
+            // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD
+            for (ComponentService service : componentD.getServices()) {
+                assert !"$promoted$ComponentB$slash$Service2".equals(service.getName());
+            }
+        }
+
+        // Should add <binding.ws> to outer composite service CompositeA/Service1 
+        wsBinding = null;
+        for (Service service : domainComposite.getServices()) {
+            if ("Service1".equals(service.getName())) {
+                wsBinding = service.getBinding(WebServiceBinding.class);
+            }
+        }
+        assert wsBinding != null;
+        if (nonWiring) {
+            // Should not add a WSDL document to domain composite service Service1
+            assert wsBinding.getWSDLDocument() == null;
+        }
+
+        if (!nonWiring) {
+            // Should create component service $promoted$Service1 on innermost component
+            //  ComponentD, with <binding.ws> and uri="/Service1"
+            wsBinding = null;
+            for (ComponentService service : componentD.getServices()) {
+                if ("$promoted$Service1".equals(service.getName())) {
+                    wsBinding = service.getBinding(WebServiceBinding.class);
+                }
+            }
+            assert "/Service1".equals(wsBinding.getURI());
+
+            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"
+            def = wsBinding.getWSDLDocument();
+            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 
+            port = svc.getPort("Service3Port");
+            assert "/Service1".equals(TestUtils.getPortAddress(port));
+        } else {
+            // Should not create component service $promoted$.Service1 on innermost component ComponentD
+            for (ComponentService service : componentD.getServices()) {
+                assert !"$promoted$Service1".equals(service.getName());
+            }
+        }
+
+        // No services on ComponentD should have <binding.ws>, except for Service3,
+        //  $promoted$.Service1 and $promoted$.ComponentB.Service2
+        for (ComponentService service : componentD.getServices()) {
+            if (!"Service3".equals(service.getName()) &&
+                !"$promoted$Service1".equals(service.getName()) &&
+                !"$promoted$ComponentB$slash$Service2".equals(service.getName())) {
+                assert service.getBinding(WebServiceBinding.class) == null;
+            }
+        }
+    }
+
+    // Scenario 5: <binding.ws> and <interface.wsdl> on outer composite reference CompositeA/reference1
+    public void testScenario5() throws Exception {
+        System.out.println("====>Running testScenario5");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario5Results(false);
+    }
+
+    public void testScenario5NonWiring() throws Exception {
+        System.out.println("====>Running testScenario5NonWiring");
+        customBuilder = new CustomCompositeBuilder(true);
+        customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario5Results(true);
+    }
+
+    private void checkScenario5Results(boolean nonWiring) {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        // Should not add <binding.ws> to any outer component references 
+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");
+        for (ComponentReference reference : componentB.getReferences()) {
+            assert reference.getBinding(WebServiceBinding.class) == null;
+        }
+
+        Definition def;
+        javax.wsdl.Service svc;
+        Port port;
+        WebServiceBinding wsBinding;
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        if (!nonWiring) {
+            // Should add <binding.ws> to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" 
+            // Should set <interface.wsdl> on inner component reference ComponentD/reference3 
+            wsBinding = null;
+            for (ComponentReference reference : componentD.getReferences()) {
+                if ("reference3".equals(reference.getName())) {
+                    wsBinding = reference.getBinding(WebServiceBinding.class);
+                    assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract;
+                }
+            }
+            assert "http://foo.com/bar".equals(wsBinding.getURI());
+
+            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"
+            def = wsBinding.getWSDLDocument();
+            svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); 
+            port = svc.getPort("Service3aPort");
+            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));
+        } else {
+            // Should not add <binding.ws> to any inner component references 
+            for (ComponentReference reference : componentD.getReferences()) {
+                assert reference.getBinding(WebServiceBinding.class) == null;
+            }
+        }
+
+        // Should not add <binding.ws> or <interface.wsdl> to inner composite reference CompositeC/reference2 
+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario5", "CompositeC"));
+        for (Reference reference : compositeC.getReferences()) {
+            assert reference.getBinding(WebServiceBinding.class) == null;
+            assert reference.getInterfaceContract() instanceof JavaInterfaceContract;
+        }
+    }
+
+    // Scenario 6: <binding.ws> and <interface.wsdl> on outer component reference ComponentB/reference2
+    public void testScenario6() throws Exception {
+        System.out.println("====>Running testScenario6");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario6and7Results("http://scenario6", false);
+    }
+
+    public void testScenario6NonWiring() throws Exception {
+        System.out.println("====>Running testScenario6NonWiring");
+        customBuilder = new CustomCompositeBuilder(true);
+        customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario6and7Results("http://scenario6", true);
+    }
+
+    private void checkScenario6and7Results(String namespace, boolean nonWiring) {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        // Should remove target= on ComponentB/reference2 (for Scenario 6) or
+        //  CompositeC/reference2 (for Scenario 7), and add uri="http://foo.com/bar"
+        //  to the <binding.ws> element on ComponentB/reference2
+        // For nonWiring, ComponentB/reference2 should have target=
+        //  and no uri= should be added
+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");
+        WebServiceBinding wsBinding = null;
+        for (ComponentReference reference : componentB.getReferences()) {
+            if ("reference2".equals(reference.getName())) {
+                if (!nonWiring) {
+                    assert reference.getTargets().size() == 0;
+                } else {
+                    assert reference.getTargets().size() == 1;
+                }
+                wsBinding = reference.getBinding(WebServiceBinding.class);
+            }
+        }
+        if (!nonWiring) {
+            assert "http://foo.com/bar".equals(wsBinding.getURI());
+        } else {
+            assert wsBinding.getURI() == null;
+        }
+
+        Definition def;
+        javax.wsdl.Service svc;
+        Port port;
+        if (!nonWiring) {
+            // Should create WSDL document for ComponentB/reference2 with endpoint uri="http://foo.com/bar"
+            def = wsBinding.getWSDLDocument();
+            svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); 
+            port = svc.getPort("Service3aPort");
+            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));
+        }
+
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        if (!nonWiring) {
+            // Should add <binding.ws> to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" 
+            // Should set <interface.wsdl> on inner component reference ComponentD/reference3 
+            wsBinding = null;
+            for (ComponentReference reference : componentD.getReferences()) {
+                if ("reference3".equals(reference.getName())) {
+                    wsBinding = reference.getBinding(WebServiceBinding.class);
+                    assert reference.getBindings().size() == 1;
+                    assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract;
+                }
+            }
+            assert "http://foo.com/bar".equals(wsBinding.getURI());
+
+            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"
+            def = wsBinding.getWSDLDocument();
+            svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); 
+            port = svc.getPort("Service3aPort");
+            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));
+        } else {
+            // Should not add <binding.ws> to any inner component references 
+            for (ComponentReference reference : componentD.getReferences()) {
+                assert reference.getBinding(WebServiceBinding.class) == null;
+            }
+        }
+
+        // No references on CompositeC should have <binding.ws> or <interface.wsdl>, except for
+        //  reference2 in Scenario 7
+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC"));
+        for (Reference reference : compositeC.getReferences()) {
+            if ("http://scenario7".equals(namespace) && "reference2".equals(reference.getName())) {
+                assert reference.getBinding(WebServiceBinding.class)!= null;
+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;
+            } else {
+                assert reference.getBinding(WebServiceBinding.class) == null;
+                assert reference.getInterfaceContract() instanceof JavaInterfaceContract;
+            }
+        }
+
+        // Should add <binding.ws> and <interface.wsdl> to outer composite reference CompositeA/reference1 
+        wsBinding = null;
+        for (Reference reference : domainComposite.getReferences()) {
+            if ("reference1".equals(reference.getName())) {
+                wsBinding = reference.getBinding(WebServiceBinding.class);
+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;
+            }
+        }
+        assert wsBinding.getURI() == null;
+
+        // Should not add a WSDL document to domain composite reference reference1
+        assert wsBinding.getWSDLDocument() == null;
+    }
+
+    // Scenario 7: <binding.ws> and <interface.wsdl> on inner composite reference CompositeC/reference2
+    public void testScenario7() throws Exception {
+        System.out.println("====>Running testScenario7");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario6and7Results("http://scenario7", false);
+    }
+
+    public void testScenario7NonWiring() throws Exception {
+        System.out.println("====>Running testScenario7NonWiring");
+        customBuilder = new CustomCompositeBuilder(true);
+        customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario6and7Results("http://scenario7", true);
+    }
+
+    // Scenario 8: <binding.ws> and <interface.wsdl> on inner component reference ComponentD/reference3
+    public void testScenario8() throws Exception {
+        System.out.println("====>Running testScenario8");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario8Results(false);
+    }
+
+    public void testScenario8NonWiring() throws Exception {
+        System.out.println("====>Running testScenario8NonWiring");
+        customBuilder = new CustomCompositeBuilder(true);
+        customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario8Results(true);
+    }
+
+    private void checkScenario8Results(boolean nonWiring) {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        // Should replace target= on ComponentD/reference3 by uri="http://foo.com/bar" on <binding.ws>
+        // For nonWiring, the original target= is preserved and there is no uri=
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        WebServiceBinding wsBinding = null;
+        for (ComponentReference reference : componentD.getReferences()) {
+            if ("reference3".equals(reference.getName())) {
+                if (!nonWiring) {
+                    assert reference.getTargets().size() == 0;
+                } else {
+                    assert reference.getTargets().size() == 1;
+                }
+                wsBinding = reference.getBinding(WebServiceBinding.class);
+            }
+        }
+        if (!nonWiring) {
+            assert "http://foo.com/bar".equals(wsBinding.getURI());
+        } else {
+            assert wsBinding.getURI() == null;
+        }
+
+        Definition def;
+        javax.wsdl.Service svc;
+        Port port;
+        if (!nonWiring) {
+            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"
+            def = wsBinding.getWSDLDocument();
+            svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); 
+            port = svc.getPort("Service3aPort");
+            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));
+        }
+
+        // Should add <binding.ws> and <interface.wsdl> to inner composite reference CompositeC/reference2 
+        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario8", "CompositeC"));
+        wsBinding = null;
+        for (Reference reference : compositeC.getReferences()) {
+            if ("reference2".equals(reference.getName())) {
+                wsBinding = reference.getBinding(WebServiceBinding.class);
+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;
+            }
+        }
+        assert wsBinding.getURI() == null;
+
+        // Should add <binding.ws> and <interface.wsdl> to outer component reference ComponentB/reference2 
+        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");
+        wsBinding = null;
+        for (ComponentReference reference : componentB.getReferences()) {
+            if ("reference2".equals(reference.getName())) {
+                wsBinding = reference.getBinding(WebServiceBinding.class);
+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;
+            }
+        }
+        assert wsBinding.getURI() == null;
+
+        // Should add <binding.ws> and <interface.wsdl> to outer composite reference CompositeA/reference1 
+        wsBinding = null;
+        for (Reference reference : domainComposite.getReferences()) {
+            if ("reference1".equals(reference.getName())) {
+                wsBinding = reference.getBinding(WebServiceBinding.class);
+                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;
+            }
+        }
+        assert wsBinding.getURI() == null;
+
+        // Should not add a WSDL document to domain composite reference reference1
+        assert wsBinding.getWSDLDocument() == null;
+    }
+
+    // Scenario 9: target in reference CDR3A and binding.ws uri= at CAR1A
+    public void testScenario9() throws Exception {
+        System.out.println("====>Running testScenario9");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario9.composite", "TestContribution", "src/main/resources/scenario9/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario9Results();
+    }    
+
+    private void checkScenario9Results() {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        ComponentReference componentRef = null;
+        for (ComponentReference reference : componentD.getReferences()) {
+            if ("reference3a".equals(reference.getName())) {
+                componentRef = reference;
+                assertTrue(reference.getBindings().size() == 2);
+                assertTrue(reference.getBindings().get(0) instanceof SCABinding);
+                assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);
+            }
+        }
+        assertTrue(componentRef != null);
+    }    
+    
+    // Scenario 10: targets in references CBR2A and CDR3A and binding.ws at CBR2A
+    public void testScenario10() throws Exception {
+        System.out.println("====>Running testScenario10");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario10.composite", "TestContribution", "src/main/resources/scenario10/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario10And11Results();
+    }    
+    
+    // Scenario 11: targets in references CBR2A and CDR3A and binding.ws at CCR2A
+    public void testScenario11() throws Exception {
+        System.out.println("====>Running testScenario11");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario11.composite", "TestContribution", "src/main/resources/scenario11/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario10And11Results();
+    }
+
+    private void checkScenario10And11Results() {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        ComponentReference componentRef = null;
+        for (ComponentReference reference : componentD.getReferences()) {
+            if ("reference3a".equals(reference.getName())) {
+                componentRef = reference;
+                assertTrue(reference.getBindings().size() == 2);
+                Binding binding1 = reference.getBindings().get(0);
+                assertTrue(binding1 instanceof SCABinding);
+                assertTrue(reference.getInterfaceContract(binding1) instanceof JavaInterfaceContract);
+                Binding binding2 = reference.getBindings().get(1);
+                assertTrue(binding2 instanceof WebServiceBinding);
+                assertTrue(reference.getInterfaceContract(binding2) instanceof WSDLInterfaceContract);
+            }
+        }
+        assertTrue(componentRef != null);
+    }  
+
+    // Scenario 12: targets in references CBR2A and CDR3A and binding.ws at CDR3A
+    public void testScenario12() throws Exception {
+        System.out.println("====>Running testScenario12");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario12.composite", "TestContribution", "src/main/resources/scenario12/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario12Results();
+    }
+
+    private void checkScenario12Results() {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        ComponentReference componentRef = null;
+        for (ComponentReference reference : componentD.getReferences()) {
+            if ("reference3a".equals(reference.getName())) {
+                componentRef = reference;
+                assertTrue(reference.getBindings().size() == 2);
+                assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding);
+                assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);
+            }
+        }
+        assertTrue(componentRef != null);
+    }
+
+    // Scenario 13: target in reference CDR3A
+    public void testScenario13() throws Exception {
+        System.out.println("====>Running testScenario13");
+        customBuilder = new CustomCompositeBuilder(false);
+        customBuilder.loadContribution("scenario13.composite", "TestContribution", "src/main/resources/scenario13/");
+        //TestUtils.printResults(customBuilder);
+        TestUtils.checkProblems(customBuilder);
+        checkScenario13Results();
+    }
+
+    private void checkScenario13Results() {
+        Composite domainComposite = customBuilder.getDomainComposite();
+
+        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
+        ComponentReference componentRef = null;
+        for (ComponentReference reference : componentD.getReferences()) {
+            if ("reference3a".equals(reference.getName())) {
+                componentRef = reference;
+                assertTrue(reference.getBindings().size() == 1);
+                assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding);
+            }
+        }
+        assertTrue(componentRef != null);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
new file mode 100644
index 0000000000..6ec2ea849e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import java.util.logging.Logger;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.DefaultEndpointFactory;
+import org.apache.tuscany.sca.assembly.EndpointFactory;
+import org.apache.tuscany.sca.assembly.SCABindingFactory;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
+
+/**
+ * Test version of org.apache.tuscany.sca.assembly.builder.impl.builder.CompositeBuilderImpl
+ *
+ * This class should be identical to CompositeBuilderImpl except for omitting the
+ * following builders:
+ *  componentWireBuilder
+ *  compositeReferenceWireBuilder
+ *  compositePromotedServiceBuilder
+ * It omits the component wiring step and the special processing that's performed
+ * for composite service and reference promotion.
+ * 
+ * @version $Rev: 674139 $ $Date: 2008-07-05 00:20:36 +0100 (Sat, 05 Jul 2008) $
+ */
+public class CompositeBuilderNonWiringImpl implements CompositeBuilder {
+    private static final Logger logger = Logger.getLogger(CompositeBuilderNonWiringImpl.class.getName());
+    private CompositeBuilder compositeIncludeBuilder;
+  //private CompositeBuilder componentReferenceWireBuilder;
+  //private CompositeBuilder componentReferencePromotionWireBuilder;
+  //private CompositeBuilder compositeReferenceWireBuilder;
+    private CompositeBuilder compositeCloneBuilder;
+    private CompositeBuilder componentConfigurationBuilder;
+    private CompositeBuilder compositeServiceConfigurationBuilder;
+    private CompositeBuilder compositeReferenceConfigurationBuilder;
+    private CompositeBuilder compositeBindingURIBuilder;
+    private CompositeBuilder componentServicePromotionBuilder;
+  //private CompositeBuilder compositeServicePromotionBuilder;
+    private CompositeBuilder compositePromotionBuilder;
+    private CompositeBuilder compositePolicyBuilder;
+    private CompositeBuilder componentServiceBindingBuilder;
+    private CompositeBuilder componentReferenceBindingBuilder;
+    
+    /**
+     * Constructs a new composite builder.
+     * 
+     * @param assemblyFactory
+     * @param scaBindingFactory
+     * @param intentAttachPointTypeFactory
+     * @param interfaceContractMapper
+     * @param monitor
+     */
+    public CompositeBuilderNonWiringImpl(AssemblyFactory assemblyFactory,
+                                SCABindingFactory scaBindingFactory,
+                                IntentAttachPointTypeFactory  intentAttachPointTypeFactory,
+                                InterfaceContractMapper interfaceContractMapper,
+                                Monitor monitor) {
+        this(assemblyFactory, null, scaBindingFactory,  intentAttachPointTypeFactory, interfaceContractMapper, null, monitor);
+    }
+    
+    /**
+     * Constructs a new composite builder.
+     * 
+     * @param assemblyFactory
+     * @param scaBindingFactory
+     * @param endpointFactory
+     * @param intentAttachPointTypeFactory
+     * @param interfaceContractMapper
+     * @param policyDefinitions
+     * @param monitor
+     */
+    public CompositeBuilderNonWiringImpl(AssemblyFactory assemblyFactory,
+                                EndpointFactory endpointFactory,
+                                SCABindingFactory scaBindingFactory,
+                                IntentAttachPointTypeFactory  intentAttachPointTypeFactory,
+                                InterfaceContractMapper interfaceContractMapper,
+                                SCADefinitions policyDefinitions,
+                                Monitor monitor) {
+        
+        if (endpointFactory == null){
+            endpointFactory = new DefaultEndpointFactory();
+        }       
+        
+        compositeIncludeBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl(monitor); 
+      //componentReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceWireBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
+      //componentReferencePromotionWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferencePromotionWireBuilderImpl(assemblyFactory, endpointFactory, monitor);
+      //compositeReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceWireBuilderImpl(assemblyFactory, endpointFactory, monitor);
+        compositeCloneBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeCloneBuilderImpl(monitor);
+        componentConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
+        compositeServiceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServiceConfigurationBuilderImpl(assemblyFactory);
+        compositeReferenceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceConfigurationBuilderImpl(assemblyFactory);
+        compositeBindingURIBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeBindingURIBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
+      //componentServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServicePromotionBuilderImpl(assemblyFactory);
+      //compositeServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServicePromotionBuilderImpl(assemblyFactory);
+        compositePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePromotionBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
+        compositePolicyBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePolicyBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
+        componentServiceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServiceBindingBuilderImpl(monitor);
+        componentReferenceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceBindingBuilderImpl(monitor);
+    }
+
+    public void build(Composite composite) throws CompositeBuilderException {
+
+        // Collect and fuse includes
+        compositeIncludeBuilder.build(composite);
+
+        // Expand nested composites
+        compositeCloneBuilder.build(composite);
+
+        // Configure all components
+        componentConfigurationBuilder.build(composite);
+
+        // Connect composite services/references to promoted services/references
+        compositePromotionBuilder.build(composite);
+        
+        // Compute the policies across the model hierarchy
+        compositePolicyBuilder.build(composite);
+        
+        // Configure composite services
+        compositeServiceConfigurationBuilder.build(composite);
+        
+        // Configure composite references
+        compositeReferenceConfigurationBuilder.build(composite);
+
+        // Configure binding URIs
+        compositeBindingURIBuilder.build(composite);
+
+        // Create promoted component services
+//      componentServicePromotionBuilder.build(composite);
+
+        // Create promoted composite services
+//      compositeServicePromotionBuilder.build(composite);
+
+        // Build component service binding-related information
+        componentServiceBindingBuilder.build(composite);
+        
+        // Wire the components
+//      componentReferenceWireBuilder.build(composite);
+
+        // Wire the promoted component references
+//      componentReferencePromotionWireBuilder.build(composite);
+
+        // Wire the composite references
+//      compositeReferenceWireBuilder.build(composite);
+
+        // Build component reference binding-related information
+        componentReferenceBindingBuilder.build(composite);
+        
+        // Fuse nested composites
+        //FIXME do this later
+        //cloneBuilder.fuseCompositeImplementations(composite);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
new file mode 100644
index 0000000000..82a8ca6689
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
@@ -0,0 +1,210 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.SCABindingFactory;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ModuleActivator;
+import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.MonitorFactory;
+import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
+import org.apache.tuscany.sca.workspace.Workspace;
+import org.apache.tuscany.sca.workspace.WorkspaceFactory;
+import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
+import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
+
+public class CustomCompositeBuilder {
+    private URLArtifactProcessor<Contribution> contributionProcessor;
+    private ModelResolverExtensionPoint modelResolvers;
+    private ModelFactoryExtensionPoint modelFactories;
+    private WorkspaceFactory workspaceFactory;
+    private AssemblyFactory assemblyFactory;
+    private XMLOutputFactory outputFactory;
+    private StAXArtifactProcessor<Object> xmlProcessor; 
+    private ContributionDependencyBuilder contributionDependencyBuilder;
+    private CompositeBuilder domainCompositeBuilder;
+    private static Workspace workspace;
+    private List<SCADefinitions> policyDefinitions;
+    private Monitor monitor;
+    private Composite domainComposite;
+    private boolean nonWiring;
+
+    protected CustomCompositeBuilder(boolean nonWiring) {
+        this.nonWiring = nonWiring;
+    }
+
+    private void init() {
+        
+        // Create extension point registry 
+        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+        
+        // Create a monitor
+        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
+        monitor = monitorFactory.createMonitor();
+        
+        // Initialize the Tuscany module activators
+        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
+        for (ModuleActivator activator : moduleActivators.getModuleActivators()) {
+            activator.start(extensionPoints);
+        }
+        
+        // Get XML input/output factories
+        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
+        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);       
+        
+        // Get contribution workspace and assembly model factories
+        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
+        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        
+        // Create XML artifact processors
+        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);
+        
+        // Create contribution content processor
+        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
+        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
+        
+        // Get the model resolvers
+        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
+        
+        // Create a contribution dependency builder
+        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
+        
+        // Create a composite builder
+        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
+        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
+        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
+        if (nonWiring) {
+            domainCompositeBuilder = new CompositeBuilderNonWiringImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor);
+        } else {
+            domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor);
+        }
+    }
+    
+    public void loadContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
+        init();
+
+        // Create workspace model
+        workspace = workspaceFactory.createWorkspace();
+        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
+
+        // Read the test contribution
+        URI artifactURI = URI.create(sourceURI);
+        URL artifactURL = new File(sourceURL).toURI().toURL();
+        URL contributionURL = new File(compositeURL).toURI().toURL();
+        Contribution testContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);                 
+        workspace.getContributions().add(testContribution);
+        
+        // Build the contribution dependencies
+        Map<Contribution, List<Contribution>> contributionDependencies = new HashMap<Contribution, List<Contribution>>();
+        Set<Contribution> resolved = new HashSet<Contribution>();
+        for (Contribution contribution: workspace.getContributions()) {
+            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
+            
+            // Resolve contributions
+            for (Contribution dependency: dependencies) {
+                if (!resolved.contains(dependency)) {
+                    resolved.add(dependency);
+                    contributionProcessor.resolve(dependency, workspace.getModelResolver());                                       
+                }
+            }
+            
+            contributionDependencies.put(contribution, dependencies);
+        }
+        
+        // Create a composite model for the domain
+        domainComposite = assemblyFactory.createComposite();
+        domainComposite.setName(new QName(Constants.SCA10_NS, "domain"));
+        
+        // Add all deployables to it, normally the domain administrator would select
+        // the deployables to include
+        domainComposite.getIncludes().addAll(workspace.getDeployables());
+        
+        // Build the domain composite and wire the components included in it
+        domainCompositeBuilder.build(domainComposite);
+    }
+    
+    /**
+     * Returns the delegating model processor.
+     * @return the delegating model processor
+     */
+    public StAXArtifactProcessor<Object> getModelProcessor() {
+        return xmlProcessor;
+    }
+    
+    /**
+     * Returns the XML output factory.
+     * @return the XML output factory
+     */
+    public XMLOutputFactory getOutputFactory() {
+        return outputFactory;
+    }
+    
+    /**
+     * Returns the domain composite.
+     * @return the domain composite model object
+     */
+    public Composite getDomainComposite() {
+        return domainComposite;
+    }
+    
+    /**
+     * Returns the monitor.
+     * @return the monitor instance
+     */
+    public Monitor getMonitor() {
+        return monitor;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
new file mode 100644
index 0000000000..9bff4d394e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
@@ -0,0 +1,203 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.builder;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLWriter;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLStreamWriter;
+import junit.framework.TestCase;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Contract;
+import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
+import org.w3c.dom.Document;
+
+/**
+ * Static utility methods for use by test cases.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class TestUtils {
+
+    protected static void checkProblems(CustomCompositeBuilder customBuilder) throws Exception {
+        boolean problems = false;
+        for (Problem problem : customBuilder.getMonitor().getProblems()) {
+            if (problem.getCause() != null) {
+                problem.getCause().printStackTrace();
+            }
+            problems = true;
+        }
+        assert !problems;
+    }
+
+    protected static String getPortAddress(Port port) {
+        Object ext = port.getExtensibilityElements().get(0);
+        if (ext instanceof SOAPAddress) {
+            return ((SOAPAddress)ext).getLocationURI();
+        }
+        if (ext instanceof SOAP12Address) {
+            return ((SOAP12Address)ext).getLocationURI();
+        }
+        return null;
+    }
+
+    protected static Component getComponent(Composite composite, String name) {
+        for (Component component : composite.getComponents()) {
+            if (name.equals(component.getName())) {
+                return component;
+            }
+            // process implementation composites recursively
+            Implementation impl = component.getImplementation();
+            if (impl instanceof Composite) {
+                Component comp = getComponent((Composite)impl, name);
+                if (comp != null) {
+                    return comp;
+                }
+            }
+        }
+        return null;
+    }
+
+    protected static Composite getComposite(Composite composite, QName name) {
+        if (name.equals(composite.getName())) {
+            return composite;
+        }
+        for (Component component : composite.getComponents()) {
+            // process implementation composites recursively
+            Implementation impl = component.getImplementation();
+            if (impl instanceof Composite) {
+                Composite comp = getComposite((Composite)impl, name);
+                if (comp != null) {
+                    return comp;
+                }
+            }
+        }
+        return null;
+    }
+
+    protected static void printResults(CustomCompositeBuilder customBuilder) throws Exception {
+        for (Problem problem : customBuilder.getMonitor().getProblems()) {
+            if (problem.getCause() != null) {
+                problem.getCause().printStackTrace();
+            }
+        }
+        Composite domainComposite = customBuilder.getDomainComposite();
+        printComposite(domainComposite, customBuilder);
+    }
+
+    private static void printComposite(Composite composite, CustomCompositeBuilder customBuilder) throws Exception {
+        // process implementation composites recursively
+        for (Component component : composite.getComponents()) {
+            Implementation implementation = component.getImplementation();
+            if (implementation instanceof Composite) {
+                printComposite((Composite)implementation, customBuilder);
+            }
+        }
+
+        // write out the SCDL
+        writeSCDL(composite, customBuilder);
+
+        // find all the component service and reference bindings     
+        for (Component component : composite.getComponents()) {
+            for (ComponentService componentService : component.getServices()) {
+                for (Binding binding : componentService.getBindings()) {
+                    if (binding instanceof WebServiceBinding) {
+                        writeWSDL(component, componentService, ((WebServiceBinding)binding).getWSDLDocument());
+                    }
+                }
+            }
+            for (ComponentReference componentReference : component.getReferences()) {
+                for (Binding binding : componentReference.getBindings()) {
+                    if (binding instanceof WebServiceBinding) {
+                        writeWSDL(component, componentReference, ((WebServiceBinding)binding).getWSDLDocument());
+                    }
+                }
+            }
+        }
+
+        // find all the composite service and reference bindings     
+        for (Service service : composite.getServices()) {
+            for (Binding binding : service.getBindings()) {
+                if (binding instanceof WebServiceBinding) {
+                    writeWSDL(null, service, ((WebServiceBinding)binding).getWSDLDocument());
+                }
+            }
+        }
+        for (Reference reference : composite.getReferences()) {
+            for (Binding binding : reference.getBindings()) {
+                if (binding instanceof WebServiceBinding) {
+                    writeWSDL(null, reference, ((WebServiceBinding)binding).getWSDLDocument());
+                }
+            }
+        }
+    }
+
+    private static void writeSCDL(Composite composite, CustomCompositeBuilder customBuilder) throws Exception {
+        // Print out a composite
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        XMLStreamWriter writer = customBuilder.getOutputFactory().createXMLStreamWriter(bos);
+        customBuilder.getModelProcessor().write(composite, writer);
+        
+        // Parse and write again to pretty format it
+        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
+        OutputFormat format = new OutputFormat();
+        format.setIndenting(true);
+        format.setIndent(2);
+        XMLSerializer serializer = new XMLSerializer(System.out, format);
+        System.out.println("-->Runtime SCDL model for composite " + composite.getName());
+        serializer.serialize(document);
+    }
+
+    private static void writeWSDL(Component component, Contract contract, Definition definition) {
+        if (definition == null) {
+            System.out.println("-->No generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName());
+        } else {
+            try {
+                System.out.println("-->Generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName());
+                WSDLWriter writer =  WSDLFactory.newInstance().newWSDLWriter();
+                writer.writeWSDL(definition, System.out);
+            } catch (WSDLException e) {
+                // ignore
+            }
+        }
+    }
+
+}
author	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2009-11-11 23:08:11 +0000
committer	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2009-11-11 23:08:11 +0000
commit	0cc8ed2208c9d04057bcb00859490290e3aa948c (patch)
tree	0087418cfdfc40a85fc250a9c36cb8ddc0ebb5db /sca-java-1.x/branches/sca-java-1.3.2/itest/builder/src
parent	e0ff67c0b32813ea48734c770a5ffc1952644e29 (diff)