You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2008/07/25 14:09:37 UTC

svn commit: r679774 [1/5] - in /tuscany/java/sca: itest/ itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ itest/builder/src/main/resources/scenario1/ itest/builder/src/main/resources/scenario10/ itest/builder/src/main/resources/scenari...

Author: nash
Date: Fri Jul 25 05:09:35 2008
New Revision: 679774

URL: http://svn.apache.org/viewvc?rev=679774&view=rev
Log:
Copy 1.3 branch revisions 678491, 678875, 679082, 679205, 679334 and 679385

Added:
    tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
    tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
    tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
    tuscany/java/sca/itest/builder/src/main/resources/scenario10/
    tuscany/java/sca/itest/builder/src/main/resources/scenario10/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario10/service3.wsdl
    tuscany/java/sca/itest/builder/src/main/resources/scenario11/
    tuscany/java/sca/itest/builder/src/main/resources/scenario11/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario11/service3.wsdl
    tuscany/java/sca/itest/builder/src/main/resources/scenario12/
    tuscany/java/sca/itest/builder/src/main/resources/scenario12/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario13/
    tuscany/java/sca/itest/builder/src/main/resources/scenario13/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario5/
    tuscany/java/sca/itest/builder/src/main/resources/scenario5/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenarios.wsdl
    tuscany/java/sca/itest/builder/src/main/resources/scenario6/
    tuscany/java/sca/itest/builder/src/main/resources/scenario6/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario6/scenario6.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario6/scenario6a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario6/scenarios.wsdl
    tuscany/java/sca/itest/builder/src/main/resources/scenario7/
    tuscany/java/sca/itest/builder/src/main/resources/scenario7/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario7/scenario7.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario7/scenario7a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario7/scenarios.wsdl
    tuscany/java/sca/itest/builder/src/main/resources/scenario8/
    tuscany/java/sca/itest/builder/src/main/resources/scenario8/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario8/scenario8.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario8/scenario8a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario8/scenarios.wsdl
    tuscany/java/sca/itest/builder/src/main/resources/scenario9/
    tuscany/java/sca/itest/builder/src/main/resources/scenario9/META-INF/
    tuscany/java/sca/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
    tuscany/java/sca/itest/builder/src/main/resources/scenario9/scenario9.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario9/scenario9a.composite
    tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
Modified:
    tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
    tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite
    tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite
    tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
    tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
    tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
    tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
    tuscany/java/sca/itest/pom.xml
    tuscany/java/sca/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
    tuscany/java/sca/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
    tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties
    tuscany/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
    tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
    tuscany/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
    tuscany/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
    tuscany/java/sca/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
    tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
    tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
    tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
    tuscany/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
    tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite

Modified: tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java (original)
+++ tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java Fri Jul 25 05:09:35 2008
@@ -18,6 +18,9 @@
  */
 package org.apache.tuscany.sca.itest.builder;
 
+import java.util.List;
+
+import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
 /**
@@ -28,6 +31,9 @@
 @Service(interfaces={Service3.class, Service3a.class})
 public class ComponentDImpl implements Service3, Service3a {
 
+    @Reference
+    protected Service3a reference3;
+
     public String getGreetings(String name) {
         return "Hello, " + name + "!";
     }

Added: tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java (added)
+++ tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java Fri Jul 25 05:09:35 2008
@@ -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: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $
+ */
+@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 + "!";
+    }
+
+}

Added: tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java (added)
+++ tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java Fri Jul 25 05:09:35 2008
@@ -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: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $
+ */
+@Service(interfaces={Service3.class})
+public class ComponentEImpl implements Service3 {
+
+
+    public String getGreetings(String name) {
+        return "Hello, " + name + " from ComponentE";
+    }
+}

Added: tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java (added)
+++ tuscany/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java Fri Jul 25 05:09:35 2008
@@ -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: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $
+ */
+@Service(interfaces={Service3.class})
+public class ComponentFImpl implements Service3 {
+
+
+    public String getGreetings(String name) {
+        return "Hello, " + name + " from ComponentF";
+    }
+}

Modified: tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite (original)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite Fri Jul 25 05:09:35 2008
@@ -1,3 +1,22 @@
+<?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"
@@ -7,6 +26,9 @@
         <!-- 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" />
@@ -16,7 +38,8 @@
         <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>
-

Modified: tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite (original)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite Fri Jul 25 05:09:35 2008
@@ -1,3 +1,22 @@
+<?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"
@@ -9,6 +28,9 @@
     <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"/>
@@ -18,7 +40,8 @@
         <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>
-
-

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10a.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario10/scenario10a.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario10/service3.wsdl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario10/service3.wsdl?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario10/service3.wsdl (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario10/service3.wsdl Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11a.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario11/scenario11a.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario11/service3.wsdl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario11/service3.wsdl?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario11/service3.wsdl (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario11/service3.wsdl Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12a.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario12/scenario12a.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13a.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario13/scenario13a.composite Fri Jul 25 05:09:35 2008
@@ -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>

Modified: tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite (original)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite Fri Jul 25 05:09:35 2008
@@ -1,3 +1,22 @@
+<?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"
@@ -6,16 +25,21 @@
     <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>
-

Modified: tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite (original)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite Fri Jul 25 05:09:35 2008
@@ -1,3 +1,22 @@
+<?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"
@@ -5,11 +24,13 @@
 
     <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"/>
@@ -19,7 +40,8 @@
         <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>
-
-

Modified: tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite (original)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite Fri Jul 25 05:09:35 2008
@@ -1,3 +1,22 @@
+<?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"
@@ -6,17 +25,20 @@
     <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>
-

Modified: tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite (original)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite Fri Jul 25 05:09:35 2008
@@ -1,3 +1,22 @@
+<?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"
@@ -5,10 +24,14 @@
 
     <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"/>
@@ -18,7 +41,8 @@
         <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>
-
-

Modified: tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite (original)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite Fri Jul 25 05:09:35 2008
@@ -1,3 +1,22 @@
+<?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"
@@ -6,6 +25,9 @@
     <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" />
@@ -15,7 +37,8 @@
         <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>
-

Modified: tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite?rev=679774&r1=679773&r2=679774&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite (original)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite Fri Jul 25 05:09:35 2008
@@ -1,3 +1,22 @@
+<?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"
@@ -9,6 +28,9 @@
     <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"/>
@@ -19,7 +41,8 @@
         <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>
-
-

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5a.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5a.composite?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5a.composite (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenario5a.composite Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenarios.wsdl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenarios.wsdl?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenarios.wsdl (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario5/scenarios.wsdl Fri Jul 25 05:09:35 2008
@@ -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>

Added: tuscany/java/sca/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml?rev=679774&view=auto
==============================================================================
--- tuscany/java/sca/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml (added)
+++ tuscany/java/sca/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml Fri Jul 25 05:09:35 2008
@@ -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>