Author: slaws
Date: Wed Jun 16 09:13:09 2010
New Revision: 955162
URL: http://svn.apache.org/viewvc?rev=955162&view=rev
Log:
Re-enable the wsdl first contribution and the test case that launches it
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
- copied, changed from r954737,
tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java
Removed:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
Modified: tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml?rev=955162&r1=955161&r2=955162&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml Wed Jun
16 09:13:09 2010
@@ -89,10 +89,10 @@
<goal>wsimport</goal>
</goals>
<configuration>
-
<packageName>org.apache.tuscany.sca.binding.ws</packageName>
+
<packageName>org.apache.tuscany.sca.binding.ws.sca</packageName>
<wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
<wsdlFiles>
- <wsdlFile>helloworld-sca.wsdl</wsdlFile>
+ <wsdlFile>HelloWorldImplService.wsdl</wsdlFile>
</wsdlFiles>
<staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
</configuration>
@@ -107,7 +107,7 @@
<packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
<wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
<wsdlFiles>
- <wsdlFile>helloworld-external.wsdl</wsdlFile>
+
<wsdlFile>helloworld-external-service.wsdl</wsdlFile>
</wsdlFiles>
<staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile>
</configuration>
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java?rev=955162&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
(added)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
Wed Jun 16 09:13:09 2010
@@ -0,0 +1,32 @@
+/*
+ * 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.binding.ws;
+
+import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
+import org.oasisopen.sca.ServiceRuntimeException;
+import org.oasisopen.sca.annotation.Remotable;
+
+...@remotable
+public interface HelloWorld {
+
+ String getGreetings(String s);
+ String getGreetingsException(String s) throws ServiceRuntimeException;
+ Foo getGreetingsComplex(Foo foo);
+}
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java?rev=955162&r1=955161&r2=955162&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
Wed Jun 16 09:13:09 2010
@@ -19,13 +19,15 @@
package org.apache.tuscany.sca.binding.ws;
-import org.apache.tuscany.sca.binding.ws.HelloWorld;
+import
org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
+import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
+import org.oasisopen.sca.ServiceRuntimeException;
import org.oasisopen.sca.annotation.Reference;
public class HelloWorldImpl implements HelloWorld {
@Reference
- public
org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorld
helloWorldExternal;
+ public HelloWorldService helloWorldExternal;
public String getGreetings(String s) {
System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
@@ -33,11 +35,19 @@ public class HelloWorldImpl implements H
System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
return response;
}
-/*
+
+ public String getGreetingsException(String s) throws
ServiceRuntimeException {
+ System.out.println("Entering SCA HelloWorld.getGreetingsException: " +
s);
+ String response = helloWorldExternal.getGreetings(s);
+ System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
+ throw new ServiceRuntimeException(response);
+ }
+
public Foo getGreetingsComplex(Foo foo){
- Foo response = null;//helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("At client: " + response.getBars()[0].getS());
+ System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " +
foo.getBars().get(0).getS());
+ Foo response = helloWorldExternal.getGreetingsComplex(foo);
+ System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " +
foo.getBars().get(0).getS());
return response;
}
-*/
+
}
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl?rev=955162&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
(added)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
Wed Jun 16 09:13:09 2010
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ * 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.
+-->
+<definitions targetNamespace="http://ws.binding.sca.tuscany.apache.org/";
+ name="HelloWorldImplService"
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:tns="http://ws.binding.sca.tuscany.apache.org/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";>
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/";
+ schemaLocation="HelloWorldImplService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="getGreetings">
+ <part name="parameters" element="tns:getGreetings"/>
+ </message>
+ <message name="getGreetingsResponse">
+ <part name="parameters" element="tns:getGreetingsResponse"/>
+ </message>
+ <message name="getGreetingsException">
+ <part name="parameters" element="tns:getGreetingsException"/>
+ </message>
+ <message name="getGreetingsExceptionResponse">
+ <part name="parameters" element="tns:getGreetingsExceptionResponse"/>
+ </message>
+ <message name="Exception">
+ <part name="fault" element="tns:Exception"/>
+ </message>
+ <message name="getGreetingsComplex">
+ <part name="parameters" element="tns:getGreetingsComplex"/>
+ </message>
+ <message name="getGreetingsComplexResponse">
+ <part name="parameters" element="tns:getGreetingsComplexResponse"/>
+ </message>
+ <portType name="HelloWorldImpl">
+ <operation name="getGreetings">
+ <input message="tns:getGreetings"/>
+ <output message="tns:getGreetingsResponse"/>
+ </operation>
+ <operation name="getGreetingsException">
+ <input message="tns:getGreetingsException"/>
+ <output message="tns:getGreetingsExceptionResponse"/>
+ <fault message="tns:Exception" name="Exception"/>
+ </operation>
+ <operation name="getGreetingsComplex">
+ <input message="tns:getGreetingsComplex"/>
+ <output message="tns:getGreetingsComplexResponse"/>
+ </operation>
+ </portType>
+ <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http";
style="document"/>
+ <operation name="getGreetings">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="getGreetingsException">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ <fault name="Exception">
+ <soap:fault name="Exception" use="literal"/>
+ </fault>
+ </operation>
+ <operation name="getGreetingsComplex">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="HelloWorldImplService">
+ <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding">
+ <soap:address
location="http://localhost:8085/HelloWorldService/HelloWorld"/>
+ </port>
+ </service>
+</definitions>
+
+
+
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd?rev=955162&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
(added)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
Wed Jun 16 09:13:09 2010
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ * 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.
+-->
+<xs:schema version="1.0"
targetNamespace="http://ws.binding.sca.tuscany.apache.org/";
+ xmlns:tns="http://ws.binding.sca.tuscany.apache.org/";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+
+ <xs:element name="Exception" type="tns:Exception"/>
+
+ <xs:element name="getGreetings" type="tns:getGreetings"/>
+
+ <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
+
+ <xs:element name="getGreetingsComplexResponse"
type="tns:getGreetingsComplexResponse"/>
+
+ <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>
+
+ <xs:element name="getGreetingsExceptionResponse"
type="tns:getGreetingsExceptionResponse"/>
+
+ <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
+
+ <xs:complexType name="getGreetingsException">
+ <xs:sequence>
+ <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="getGreetingsExceptionResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="Exception">
+ <xs:sequence>
+ <xs:element name="message" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="getGreetings">
+ <xs:sequence>
+ <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="getGreetingsResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="getGreetingsComplex">
+ <xs:sequence>
+ <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="foo">
+ <xs:sequence>
+ <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="bar">
+ <xs:sequence>
+ <xs:element name="b" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="s" type="xs:string" minOccurs="0"/>
+ <xs:element name="x" type="xs:int"/>
+ <xs:element name="y" type="xs:int" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="getGreetingsComplexResponse">
+ <xs:sequence>
+ <xs:element name="return" type="tns:foo" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd?rev=955162&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
(added)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
Wed Jun 16 09:13:09 2010
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ * 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.
+-->
+<xs:schema version="1.0" targetNamespace="http://helloworld/external";
xmlns:tns="http://helloworld/external";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+
+ <xs:element name="getGreetings" type="tns:getGreetings"/>
+
+ <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
+
+ <xs:element name="getGreetingsComplexResponse"
type="tns:getGreetingsComplexResponse"/>
+
+ <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
+
+ <xs:complexType name="getGreetings">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="getGreetingsResponse">
+ <xs:sequence>
+ <xs:element name="getGreetingsReturn" type="xs:string" form="qualified"
minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="getGreetingsComplex">
+ <xs:sequence>
+ <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="foo">
+ <xs:sequence>
+ <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="bar">
+ <xs:sequence>
+ <xs:element name="b" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="s" type="xs:string" minOccurs="0"/>
+ <xs:element name="x" type="xs:int"/>
+ <xs:element name="y" type="xs:int" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="getGreetingsComplexResponse">
+ <xs:sequence>
+ <xs:element name="return" type="tns:foo" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
+
Added:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl?rev=955162&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
(added)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
Wed Jun 16 09:13:09 2010
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ * 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.
+-->
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is
JAX-WS RI 2.1.7-b01-. -->
+<definitions targetNamespace="http://helloworld/external";
name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://helloworld/external";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";>
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://helloworld/external";
schemaLocation="HelloWorldServiceService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="getGreetings">
+ <part name="parameters" element="tns:getGreetings"/>
+ </message>
+ <message name="getGreetingsResponse">
+ <part name="parameters" element="tns:getGreetingsResponse"/>
+ </message>
+ <message name="getGreetingsComplex">
+ <part name="parameters" element="tns:getGreetingsComplex"/>
+ </message>
+ <message name="getGreetingsComplexResponse">
+ <part name="parameters" element="tns:getGreetingsComplexResponse"/>
+ </message>
+ <portType name="HelloWorldService">
+ <operation name="getGreetings">
+ <input message="tns:getGreetings"/>
+ <output message="tns:getGreetingsResponse"/>
+ </operation>
+ <operation name="getGreetingsComplex">
+ <input message="tns:getGreetingsComplex"/>
+ <output message="tns:getGreetingsComplexResponse"/>
+ </operation>
+ </portType>
+ <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http";
style="document"/>
+ <operation name="getGreetings">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="getGreetingsComplex">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="HelloWorldServiceService">
+ <port name="HelloWorldServicePort"
binding="tns:HelloWorldServicePortBinding">
+ <soap:address location="http://localhost:8086/External/HelloWorld"/>
+ </port>
+ </service>
+</definitions>
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite?rev=955162&r1=955161&r2=955162&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
Wed Jun 16 09:13:09 2010
@@ -25,10 +25,10 @@
<component name="HelloWorldService">
<implementation.java
class="org.apache.tuscany.sca.binding.ws.HelloWorldImpl"/>
<service name="HelloWorld">
- <binding.ws
wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+ <binding.ws
wsdlElement="http://ws.binding.sca.tuscany.apache.org/#wsdl.port(HelloWorldImplService/HelloWorldImplPort)"/>
</service>
<reference name="helloWorldExternal">
- <binding.ws
wsdlElement="http://helloworld/external#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+ <binding.ws
wsdlElement="http://helloworld/external#wsdl.port(HelloWorldServiceService/HelloWorldServicePort)"/>
</reference>
</component>
Copied:
tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
(from r954737,
tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java?p2=tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java&p1=tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java&r1=954737&r2=955162&rev=955162&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
Wed Jun 16 09:13:09 2010
@@ -19,125 +19,107 @@
package org.apache.tuscany.sca.binding.ws.launcher.axis2;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import junit.framework.TestCase;
import
org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
import
org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
+import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
+import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
-public class WSDLFirstTestCaseOFF extends TestCase {
+public class WSDLFirstTestCase extends TestCase {
private Node node;
+ private HelloWorldServiceLauncher externalService;
+ private HelloWorldClientLauncher externalClient;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
// Start the external service
- HelloWorldServiceLauncher.main(null);
+ externalService = new HelloWorldServiceLauncher();
+ externalService.createService();
// Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("common",
"../common-contribution/target/classes"),
- new
Contribution("wsdl-first", "../wsdl-first-contribution/target/classes"));
+ node = NodeFactory.newInstance().createNode(new
Contribution("wsdl-first",
"../contribution-wsdl-first/target/itest-ws-contribution-wsdl-first.jar"));
node.start();
+
+ // start the external client
+ try {
+ externalClient = new HelloWorldClientLauncher();
+ externalClient.createClient();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw ex;
+ }
}
-
- public void testCalculator() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
-/*
- public void testWait1() throws Exception {
+
+/*
+ @Test
+ public void testWait() throws Exception {
System.out.println("Press a key");
System.in.read();
- }
-
- public void testCalculator1() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator2() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator3() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator4() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator5() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator6() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator7() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator8() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator9() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator10() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator11() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
+ }
+*/
+
+ @Test
+ public void testGetGreetings() throws Exception {
+ assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
+ }
- public void testCalculator12() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
+ @Test
+ @Ignore
+ public void testGetGreetingsException() throws Exception {
+ try {
+ externalClient.getGreetingsException("Fred");
+ } catch (Exception ex) {
+ return;
+ }
+
+ fail("expecting exception");
+ }
- public void testCalculator13() throws Exception {
- HelloWorldClientLauncher.main(null);
+ @Test
+ public void testGetGreetingsComplex() throws Exception {
+ Foo f = new Foo();
+ Bar b1 = new Bar();
+ b1.setS("petra");
+ b1.setX(1);
+ b1.setY(new Integer(2));
+ b1.setB(Boolean.TRUE);
+ Bar b2 = new Bar();
+ b2.setS("beate");
+ b2.setX(3);
+ b2.setY(new Integer(4));
+ b2.setB(Boolean.FALSE);
+ f.getBars().add(b1);
+ f.getBars().add(b2);
+
+ Foo f2 = externalClient.getGreetingsComplex(f);
+
+ assertEquals("petra", f2.getBars().get(0).getS());
+ assertEquals(1, f2.getBars().get(0).getX());
+ assertEquals(2, f2.getBars().get(0).getY().intValue());
+ assertTrue(f2.getBars().get(0).isB());
+ assertEquals("simon", f2.getBars().get(2).getS());
+ assertEquals(7, f2.getBars().get(2).getX());
+ assertEquals(8, f2.getBars().get(2).getY().intValue());
+ assertTrue(f2.getBars().get(2).isB().booleanValue());
}
- public void testCalculator14() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator15() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator16() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator17() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator18() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator19() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-
- public void testCalculator20() throws Exception {
- HelloWorldClientLauncher.main(null);
- }
-*/
-
-
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
node.stop();
- node = null;
+ externalClient.destroyClient();
+ externalService.destoryService();
}
}
