From 24e45a6f5fd47b94646276534f0377f1399ab3bb Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 9 Oct 2009 08:49:49 +0000 Subject: TUSCANY-3283 generate unannotated beans into the namespace of the WSDL rather than an empty namespace git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@823459 13f79535-47bb-0310-9956-ffa450edef68 --- .../wsdlgen/src/main/java/helloworld/ABean.java | 13 + .../main/java/helloworld/HelloWorldClientImpl.java | 68 ++++ .../src/main/java/helloworld/HelloWorldImpl.java | 39 ++- .../main/java/helloworld/HelloWorldService.java | 11 +- .../src/main/resources/helloworld1.composite | 43 +++ .../wsdl/HelloWorldService_TuscanyGen.wsdl | 343 +++++++++++++++++++++ .../src/main/resources/wsdl/helloworld.wsdl | 210 ------------- .../java/helloworld/HttpTransportTestCase.java | 122 ++++++++ 8 files changed, 629 insertions(+), 220 deletions(-) create mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java create mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite create mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl delete mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl create mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java (limited to 'branches/sca-java-1.5.2/itest') diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java index 8a99a81132..bcfa0f8be7 100644 --- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java @@ -18,10 +18,15 @@ */ package helloworld; +import anotherpackage.BBean; + + + public class ABean { protected String field1; protected String field2; + protected BBean field3; public String getField1() { return field1; @@ -38,5 +43,13 @@ public class ABean { 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.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java new file mode 100644 index 0000000000..04fbe6934a --- /dev/null +++ b/branches/sca-java-1.5.2/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.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java index 83165307af..a92a819aaf 100644 --- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java @@ -18,31 +18,52 @@ */ package helloworld; -import java.util.Vector; +import javax.jws.WebService; import org.osoa.sca.annotations.Service; +import yetanotherpackage.DBean; + +import anotherpackage.BBean; +import anotherpackage.CBean; + /** * This class implements the HelloWorld service. */ +@WebService @Service(HelloWorldService.class) 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 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.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java index 6f3d57e6f7..6b0425d473 100644 --- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java @@ -18,13 +18,19 @@ */ package helloworld; -import java.util.Vector; +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 { @@ -32,5 +38,8 @@ public interface HelloWorldService { public String getGreetingsBean(ABean bean); public String getGreetingsBeanArray(ABean[] bean); //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.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite new file mode 100644 index 0000000000..12d98d3453 --- /dev/null +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl new file mode 100644 index 0000000000..6c6d8c6637 --- /dev/null +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl deleted file mode 100644 index c76ed7b338..0000000000 --- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java new file mode 100644 index 0000000000..22f154fbf3 --- /dev/null +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java @@ -0,0 +1,122 @@ +/* + * 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 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; +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 + */ +public class HttpTransportTestCase{ + + private SCADomain scaDomain; + + @Before + public void startServer() throws Exception { + scaDomain = SCADomain.newInstance("helloworld1.composite"); + } + + @Ignore + @Test + public void testWaitForInput() { + System.out.println("Press a key to end"); + try { + System.in.read(); + } catch (Exception ex) { + } + System.out.println("Shutting down"); + } + + @Test + 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 + + } + + @After + public void stopServer() throws Exception { + if (scaDomain != null) { + scaDomain.close(); + } + } + +} -- cgit v1.2.3