You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2008/12/19 00:12:08 UTC
svn commit: r727853 - in
/tuscany/java/sca/stest/sampleTest/src/main/resources: TestClient.wsdl
TestClient_0002.composite TestClient_0003.composite
TestComposite1.composite Test_ASM_0002.composite Test_ASM_0003.composite
Test_ASM_0004.composite
Author: edwardsmj
Date: Thu Dec 18 15:12:07 2008
New Revision: 727853
URL: http://svn.apache.org/viewvc?rev=727853&view=rev
Log:
Tests updated to use composite files to contain each atomic implementation - permits replacement with different implementation type(s)
Added:
tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite
tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
Modified:
tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
Modified: tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl?rev=727853&r1=727852&r2=727853&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl (original)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl Thu Dec 18 15:12:07 2008
@@ -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">
Added: tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite?rev=727853&view=auto
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite (added)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0002.composite Thu Dec 18 15:12:07 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://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>
Added: tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite?rev=727853&view=auto
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite (added)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient_0003.composite Thu Dec 18 15:12:07 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://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>
Added: tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite?rev=727853&view=auto
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite (added)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite Thu Dec 18 15:12:07 2008
@@ -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>
Modified: tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite?rev=727853&r1=727852&r2=727853&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite (original)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite Thu Dec 18 15:12:07 2008
@@ -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>
Modified: tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite?rev=727853&r1=727852&r2=727853&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite (original)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0003.composite Thu Dec 18 15:12:07 2008
@@ -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>
Modified: tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite?rev=727853&r1=727852&r2=727853&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite (original)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0004.composite Thu Dec 18 15:12:07 2008
@@ -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>