From 3449e2527900045def8d67438f1fdbda6710c40c Mon Sep 17 00:00:00 2001
From: edwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 18 Dec 2008 23:12:07 +0000
Subject: Tests updated to use composite files to contain each atomic
 implementation - permits replacement with different implementation type(s)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@727853 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sampleTest/src/main/resources/TestClient.wsdl  | 41 ++++++++++---------
 .../src/main/resources/TestClient_0002.composite   | 47 ++++++++++++++++++++++
 .../src/main/resources/TestClient_0003.composite   | 47 ++++++++++++++++++++++
 .../src/main/resources/TestComposite1.composite    | 39 ++++++++++++++++++
 .../src/main/resources/Test_ASM_0002.composite     |  9 +++--
 .../src/main/resources/Test_ASM_0003.composite     |  9 +++--
 .../src/main/resources/Test_ASM_0004.composite     | 10 ++---
 7 files changed, 169 insertions(+), 33 deletions(-)
 create mode 100644 java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite
 create mode 100644 java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite
 create mode 100644 java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite

(limited to 'java/sca/stest/sampleTest/src/main')

diff --git a/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl b/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
index 05d933e04f..41aa701ee9 100644
--- a/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
+++ b/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wsdl:definitions name="TestInvocationService" targetNamespace="http://test/"
-xmlns:test="http://test/" 
-xmlns="http://test/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 
-xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">
+  xmlns:test="http://test/" 
+  xmlns="http://test/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 
+  xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">
   <wsdl:types>
-    <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" targetNamespace="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-<xs:element name="invokeTest">
-<xs:complexType>
-<xs:sequence>
-<xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="invokeTestResponse">
-<xs:complexType>
-<xs:sequence>
-<xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-</xs:schema>
+    <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" 
+      targetNamespace="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+      <xs:element name="invokeTest">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="invokeTestResponse">
+        <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="invokeTest">
     <wsdl:part name="invokeTest" element="test:invokeTest">
diff --git a/java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite b/java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite
new file mode 100644
index 0000000000..b36f01d5b1
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://oasis/tests"
+           xmlns:tns="http://oasis/tests"
+           xmlns:sample="http://oasis/tests"
+           name="TestClient_0002">
+
+	<service name="TestInvocation" promote="TestClient/TestInvocation">
+		<interface.java interface="test.TestInvocation"/>
+	</service>
+	
+	<property name="testName" type="string"/>
+           
+    <component name="TestClient">
+		<implementation.java class="test.ASM_0002_Client"/>
+		<service name="TestInvocation">
+			<interface.java interface="test.TestInvocation"/>
+		</service>
+        <reference name="reference1">
+        	<interface.java interface="test.Service1"/>
+        </reference>
+        <property name="testName" source="$testName"/>
+    </component>
+    
+    <reference name="reference1" promote="TestClient/reference1">
+    	<interface.java interface="test.Service1"/>
+    </reference>
+
+</composite>
diff --git a/java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite b/java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite
new file mode 100644
index 0000000000..1d474fe937
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://oasis/tests"
+           xmlns:tns="http://oasis/tests"
+           xmlns:sample="http://oasis/tests"
+           name="TestClient_0003">
+
+	<service name="TestInvocation" promote="TestClient/TestInvocation">
+		<interface.java interface="test.TestInvocation"/>
+	</service>
+	
+	<property name="testName" type="string"/>
+           
+    <component name="TestClient">
+		<implementation.java class="test.ASM_0003_Client"/>
+		<service name="TestInvocation">
+			<interface.java interface="test.TestInvocation"/>
+		</service>
+        <reference name="reference1">
+        	<interface.java interface="test.Service1"/>
+        </reference>
+        <property name="testName" source="$testName"/>
+    </component>
+    
+    <reference name="reference1" promote="TestClient/reference1" multiplicity="1..n">
+    	<interface.java interface="test.Service1"/>
+    </reference>
+
+</composite>
diff --git a/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite b/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
new file mode 100644
index 0000000000..f1fd4c2d01
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
@@ -0,0 +1,39 @@
+<?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://oasis/tests"
+           xmlns:sample="http://oasis/tests"
+           name="TestComposite1">
+           
+	<service name="Service1" promote="TestComponent1/Service1">
+		<interface.java interface="test.Service1"></interface.java>
+	</service>
+
+    <property name="serviceName" type="string"/>
+ 
+    <component name="TestComponent1">
+		<implementation.java class="test.service1Impl"/>
+        <service name="Service1">
+        	<interface.java interface="test.Service1"></interface.java>
+        </service>
+        <property name="serviceName" source="$serviceName"/>
+    </component>
+
+</composite>
diff --git a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
index 590e147a47..bc6f7d0a67 100644
--- a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
+++ b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
@@ -19,11 +19,12 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            targetNamespace="http://oasis/tests"
+           xmlns:tns="http://oasis/tests"
            xmlns:sample="http://oasis/tests"
            name="TEST_ASM_0002">
            
     <component name="TestClient">
-		<implementation.java class="test.ASM_0002_Client"/>
+		<implementation.composite name="tns:TestClient_0002"/>
 		<service name="TestInvocation">
 			<interface.java interface="test.TestInvocation"/>
 			<binding.ws/>
@@ -31,13 +32,13 @@
         <reference name="reference1" target="TestComponent1/Service1" />
         <property name="testName">ASM_0002</property>
     </component>
-
- 
+
     <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
+		<implementation.composite name="tns:TestComposite1"/>
         <service name="Service1">
         	<interface.java interface="test.Service1"></interface.java>
         </service>
+        <property name="serviceName">service1</property>
     </component>
 
 </composite>
diff --git a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
index 3c59dd39a2..639dd11aae 100644
--- a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
+++ b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
@@ -22,11 +22,12 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            targetNamespace="http://oasis/tests"
+           xmlns:tns="http://oasis/tests"
            xmlns:sample="http://oasis/tests"
            name="TEST_ASM_0003">
            
     <component name="TestClient">
-		<implementation.java class="test.ASM_0003_Client"/>
+		<implementation.composite name="tns:TestClient_0003"/>
 		<service name="TestInvocation">
 			<interface.java interface="test.TestInvocation"/>
 			<binding.ws/>
@@ -37,7 +38,7 @@
 
  
     <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
+		<implementation.composite name="tns:TestComposite1"/>
         <service name="Service1">
         	<interface.java interface="test.Service1"></interface.java>
         </service>
@@ -45,7 +46,7 @@
     </component>
     
     <component name="TestComponent2">
-		<implementation.java class="test.service1Impl"/>
+		<implementation.composite name="tns:TestComposite1"/>
         <service name="Service1">
         	<interface.java interface="test.Service1"></interface.java>
         </service>
@@ -53,7 +54,7 @@
     </component>
     
     <component name="TestComponent3">
-		<implementation.java class="test.service1Impl"/>
+		<implementation.composite name="tns:TestComposite1"/>
         <service name="Service1">
         	<interface.java interface="test.Service1"></interface.java>
         </service>
diff --git a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
index ec0a98d75a..ecae73fa5c 100644
--- a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
+++ b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
@@ -21,11 +21,12 @@
 	 with multiple wire targets in the component configuration is marked as an error  -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            targetNamespace="http://oasis/tests"
+           xmlns:tns="http://oasis/tests"
            xmlns:sample="http://oasis/tests"
            name="TEST_ASM_0004">
            
     <component name="TestClient">
-		<implementation.java class="test.ASM_0002_Client"/>
+		<implementation.composite name="tns:TestClient_0002"/>
 		<service name="TestInvocation">
 			<interface.java interface="test.TestInvocation"/>
             <binding.ws/>
@@ -34,9 +35,8 @@
         <property name="testName">ASM_0004</property>
     </component>
 
- 
     <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
+		<implementation.composite name="tns:TestComposite1"/>
         <service name="Service1">
         	<interface.java interface="test.Service1"></interface.java>
         </service>
@@ -44,7 +44,7 @@
     </component>
     
     <component name="TestComponent2">
-		<implementation.java class="test.service1Impl"/>
+		<implementation.composite name="tns:TestComposite1"/>
         <service name="Service1">
         	<interface.java interface="test.Service1"></interface.java>
         </service>
@@ -52,7 +52,7 @@
     </component>
     
     <component name="TestComponent3">
-		<implementation.java class="test.service1Impl"/>
+		<implementation.composite name="tns:TestComposite1"/>
         <service name="Service1">
         	<interface.java interface="test.Service1"></interface.java>
         </service>
-- 
cgit v1.2.3