From 574b17f369e247d6711421eeeaf6d4759e7fb2e1 Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 1 Oct 2009 15:23:45 +0000 Subject: TUSCANY-3283 - improve the wsdlgen test case to test the situation where a type with a namespace references a type without a namespace git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@820686 13f79535-47bb-0310-9956-ffa450edef68 --- .../wsdlgen/src/main/java/helloworld/ABean.java | 4 +- .../main/java/helloworld/HelloWorldClientImpl.java | 68 ++++ .../src/main/java/helloworld/HelloWorldImpl.java | 33 +- .../main/java/helloworld/HelloWorldService.java | 6 + .../src/main/java/yetanotherpackage/DBean.java | 53 +++ .../src/main/resources/helloworld1.composite | 12 +- .../wsdl/HelloWorldService_TuscanyGen.wsdl | 355 +++++++++++++++++++++ .../src/main/resources/wsdl/helloworld.wsdl | 276 ---------------- .../java/helloworld/HttpTransportTestCase.java | 54 +++- .../test/resources/wsdl/HelloWorldImplService.wsdl | 137 ++++++++ .../wsdl/HelloWorldImplService_schema1.xsd | 14 + .../wsdl/HelloWorldImplService_schema2.xsd | 124 +++++++ .../itest/wsdlgen/src/test/resources/wsdl/README | 6 + 13 files changed, 851 insertions(+), 291 deletions(-) create mode 100644 branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java create mode 100644 branches/sca-java-1.x/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java create mode 100644 branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl delete mode 100644 branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl create mode 100644 branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl create mode 100644 branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd create mode 100644 branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd create mode 100644 branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/README (limited to 'branches/sca-java-1.x/itest/wsdlgen/src') diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/ABean.java b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/ABean.java index 0d2f9bf380..bcfa0f8be7 100644 --- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/ABean.java +++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/ABean.java @@ -20,6 +20,8 @@ package helloworld; import anotherpackage.BBean; + + public class ABean { protected String field1; @@ -41,7 +43,7 @@ public class ABean { public void setField2(String field2) { this.field2 = field2; } - + public BBean getField3() { return field3; } diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java new file mode 100644 index 0000000000..04fbe6934a --- /dev/null +++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java @@ -0,0 +1,68 @@ +/* + * 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 helloworld; + + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import yetanotherpackage.DBean; + +import anotherpackage.BBean; +import anotherpackage.CBean; + +/** + * This class implements the HelloWorld service. + */ +@Service(HelloWorldService.class) +public class HelloWorldClientImpl implements HelloWorldService { + + @Reference + protected HelloWorldService hwService; + + public String getGreetings(String name) { + return "Hello " + hwService.getGreetings(name); + } + + public String getGreetingsBean(ABean bean){ + return "Hello " + hwService.getGreetingsBean(bean); + } + + public String getGreetingsBeanArray(ABean[] bean){ + return "Hello " + hwService.getGreetingsBeanArray(bean); + } + + /* + public String getGreetingsBeanVector(Vector bean){ + return "Hello " + bean.get(0).getField1() + " " + bean.get(0).getField2(); + } + */ + + public String getGreetingsBBean(BBean bean){ + return "Hello " + hwService.getGreetingsBBean(bean); + } + + public String getGreetingsCBean(CBean bean){ + return "Hello " + hwService.getGreetingsCBean(bean); + } + + public String getGreetingsDBean(DBean bean){ + return "Hello " + hwService.getGreetingsDBean(bean); + } +} diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java index 788eded6f9..a92a819aaf 100644 --- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java +++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java @@ -22,6 +22,8 @@ import javax.jws.WebService; import org.osoa.sca.annotations.Service; +import yetanotherpackage.DBean; + import anotherpackage.BBean; import anotherpackage.CBean; @@ -35,26 +37,33 @@ public class HelloWorldImpl implements HelloWorldService { public String getGreetings(String name) { return "Hello " + name; } - - public String getGreetingsBean(ABean bean){ - return "Hello " + bean.getField1() + " " + bean.getField2(); + + public String getGreetingsBean(ABean bean) { + return "Hello " + bean.getField1() + " " + bean.getField2() + + bean.getField3().getField1() + " " + + bean.getField3().getField2(); } - public String getGreetingsBeanArray(ABean[] bean){ + public String getGreetingsBeanArray(ABean[] bean) { return "Hello " + bean[0].getField1() + " " + bean[0].getField2(); } - + /* - public String getGreetingsBeanVector(Vector bean){ - return "Hello " + bean.get(0).getField1() + " " + bean.get(0).getField2(); + * public String getGreetingsBeanVector(Vector bean){ return "Hello " + * + bean.get(0).getField1() + " " + bean.get(0).getField2(); } + */ + + public String getGreetingsBBean(BBean bean) { + return "Hello " + bean.getField1() + " " + bean.getField2(); } - */ - - public String getGreetingsBBean(BBean bean){ + + public String getGreetingsCBean(CBean bean) { return "Hello " + bean.getField1() + " " + bean.getField2(); } - public String getGreetingsCBean(CBean bean){ - return "Hello " + bean.getField1() + " " + bean.getField2(); + public String getGreetingsDBean(DBean bean) { + return "Hello " + bean.getField1() + " " + bean.getField2() + " " + + bean.getField3().getField1() + " " + + bean.getField3().getField2(); } } diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java index 9922b8a233..6b0425d473 100644 --- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java +++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java @@ -18,14 +18,19 @@ */ package helloworld; +import javax.jws.WebService; + import org.osoa.sca.annotations.Remotable; +import yetanotherpackage.DBean; + import anotherpackage.BBean; import anotherpackage.CBean; /** * This is the business interface of the HelloWorld greetings service. */ +@WebService @Remotable public interface HelloWorldService { @@ -35,5 +40,6 @@ public interface HelloWorldService { //public String getGreetingsBeanVector(Vector bean); public String getGreetingsBBean(BBean bean); public String getGreetingsCBean(CBean bean); + public String getGreetingsDBean(DBean bean); } diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java new file mode 100644 index 0000000000..cee893d678 --- /dev/null +++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java @@ -0,0 +1,53 @@ +/* + * 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 yetanotherpackage; + +import anotherpackage.BBean; + +public class DBean { + + protected String field1; + protected String field2; + protected BBean field3; + + public String getField1() { + return field1; + } + + public void setField1(String field1) { + this.field1 = field1; + } + + public String getField2() { + return field2; + } + + public void setField2(String field2) { + this.field2 = field2; + } + + public BBean getField3() { + return field3; + } + + public void setField3(BBean field3) { + this.field3 = field3; + } +} + diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite index 12ef393521..12d98d3453 100644 --- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite +++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite @@ -22,11 +22,21 @@ targetNamespace="http://helloworld" xmlns:hw="http://helloworld" name="helloworldws"> + + + + + + + + + + - + diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl new file mode 100644 index 0000000000..2f7b40e0ed --- /dev/null +++ b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl @@ -0,0 +1,355 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl deleted file mode 100644 index 35dfe95359..0000000000 --- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java b/branches/sca-java-1.x/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java index d52db8e812..c5c1d50bc1 100644 --- a/branches/sca-java-1.x/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java +++ b/branches/sca-java-1.x/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java @@ -22,6 +22,11 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; @@ -29,6 +34,10 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import yetanotherpackage.DBean; + +import anotherpackage.BBean; + /** * Tests that the helloworld server is available */ @@ -42,11 +51,54 @@ public class HttpTransportTestCase{ } @Test - public void testComponent1() throws IOException { + public void testComponent1SCA() throws IOException { HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent1/HelloWorldService"); assertNotNull(helloWorldService); + HelloWorldService helloWorldClient = scaDomain.getService(HelloWorldService.class, "HelloWorldClientComponent1/HelloWorldService"); + assertNotNull(helloWorldClient); + assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); + assertEquals("Hello Hello Smith", helloWorldClient.getGreetings("Smith")); + + BBean bbean = new BBean(); + bbean.setField1("1"); + bbean.setField2("2"); + + DBean abean = new DBean(); + abean.setField1("3"); + abean.setField2("4"); + abean.setField3(bbean); + + assertEquals("Hello Hello 3 4 1 2", helloWorldClient.getGreetingsDBean(abean)); + } + + @Test + public void testComponent1JAXWS() throws IOException { + + // talk to the service using JAXWS with WSDL generated from this service used wsgen + // the idea here is to demonstrate that the service is providing a JAXWS compliant + // interface + QName serviceName = new QName("http://helloworld/", "HelloWorldImplService"); + URL wsdlLocation = this.getClass().getClassLoader().getResource("wsdl/HelloWorldImplService.wsdl"); + Service webService = Service.create( wsdlLocation, serviceName ); + HelloWorldService wsProxy = (HelloWorldService) webService.getPort(HelloWorldService.class); + + assertEquals("Hello Fred", wsProxy.getGreetings("Fred")); + + BBean bbean = new BBean(); + bbean.setField1("1"); + bbean.setField2("2"); + + DBean abean = new DBean(); + abean.setField1("3"); + abean.setField2("4"); + abean.setField3(bbean); + + assertEquals("Hello 3 4 1 2", wsProxy.getGreetingsDBean(abean)); + + // repeat the JAXWS call with WSDL generated by tuscany + } diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl b/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl new file mode 100644 index 0000000000..ded4c0a9f0 --- /dev/null +++ b/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd b/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd new file mode 100644 index 0000000000..70de7a05ae --- /dev/null +++ b/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd b/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd new file mode 100644 index 0000000000..446492c371 --- /dev/null +++ b/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/README b/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/README new file mode 100644 index 0000000000..f0092fbfb1 --- /dev/null +++ b/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/README @@ -0,0 +1,6 @@ +These are files generated by JAXWS wsgen. The maven pom.xml is configured to generate +them to target/jaxws/wsgen/wsdl. These files are copied manually from there to here +and the .wsdl file is hand edited to + +1/ add the right service port location +2/ change the port type name to HelloWorldService -- cgit v1.2.3