Fix TUSCANY-2486 and TUSCANY-2324

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@678491 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 181 insertions, 0 deletions

diff --git a/branches/sca-java-1.3/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..7cb09d0a74
--- /dev/null
+++ b/branches/sca-java-1.3/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/branches/sca-java-1.3/itest/builder/src/main/resources/scenario8/scenario8.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario8/scenario8.composite
new file mode 100644
index 0000000000..26e5ee33fa
--- /dev/null
+++ b/branches/sca-java-1.3/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/branches/sca-java-1.3/itest/builder/src/main/resources/scenario8/scenario8a.composite b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario8/scenario8a.composite
new file mode 100644
index 0000000000..4fa0712199
--- /dev/null
+++ b/branches/sca-java-1.3/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/branches/sca-java-1.3/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/branches/sca-java-1.3/itest/builder/src/main/resources/scenario8/scenarios.wsdl
new file mode 100644
index 0000000000..7480419231
--- /dev/null
+++ b/branches/sca-java-1.3/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>