From 10fe9dfd3f54bcaea5bb8de60aab3390fc92a895 Mon Sep 17 00:00:00 2001 From: slaws Date: Wed, 16 Jun 2010 09:13:09 +0000 Subject: Re-enable the wsdl first contribution and the test case that launches it git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@955162 13f79535-47bb-0310-9956-ffa450edef68 --- .../trunk/itest/ws/contribution-wsdl-first/pom.xml | 6 +- .../apache/tuscany/sca/binding/ws/HelloWorld.java | 32 +++++ .../tuscany/sca/binding/ws/HelloWorldImpl.java | 22 +++- .../src/main/resources/HelloWorldImplService.wsdl | 109 ++++++++++++++++ .../resources/HelloWorldImplService_schema1.xsd | 95 ++++++++++++++ .../resources/HelloWorldServiceService_schema1.xsd | 70 ++++++++++ .../resources/helloworld-external-service.wsdl | 75 +++++++++++ .../src/main/resources/helloworld-external.wsdl | 84 ------------ .../src/main/resources/helloworld-sca.wsdl | 84 ------------ .../src/main/resources/helloworld.composite | 4 +- .../ws/launcher/axis2/WSDLFirstTestCase.java | 125 ++++++++++++++++++ .../ws/launcher/axis2/WSDLFirstTestCaseOFF.java | 143 --------------------- 12 files changed, 527 insertions(+), 322 deletions(-) create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl delete mode 100644 sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl delete mode 100644 sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl create mode 100644 sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java delete mode 100644 sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java (limited to 'sca-java-2.x/trunk') diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml index a93d502d3d..58ef07bdf4 100644 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml +++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml @@ -89,10 +89,10 @@ wsimport - org.apache.tuscany.sca.binding.ws + org.apache.tuscany.sca.binding.ws.sca ${basedir}/target/classes - helloworld-sca.wsdl + HelloWorldImplService.wsdl ${project.build.directory}/jaxws/stale/.wsimport1StaleFlag @@ -107,7 +107,7 @@ org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface ${basedir}/target/classes - helloworld-external.wsdl + helloworld-external-service.wsdl ${project.build.directory}/jaxws/stale/.wsimport2StaleFlag diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java new file mode 100644 index 0000000000..6bc67db5fc --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java @@ -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); +} diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java index 17bd6b251d..b279e7f648 100644 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java +++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java @@ -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 HelloWorld { 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; } -*/ + } diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl new file mode 100644 index 0000000000..f3e9083cec --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd new file mode 100644 index 0000000000..f579909f82 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd new file mode 100644 index 0000000000..acdfcaaaa5 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl new file mode 100644 index 0000000000..0f83f1fc08 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl deleted file mode 100644 index ca91539985..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl deleted file mode 100644 index 3808be0457..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite index b2f920739a..8d0c7bf9ff 100644 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite +++ b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite @@ -25,10 +25,10 @@ - + - + diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java new file mode 100644 index 0000000000..8763f08c71 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java @@ -0,0 +1,125 @@ +/* + * 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.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 WSDLFirstTestCase extends TestCase { + + private Node node; + private HelloWorldServiceLauncher externalService; + private HelloWorldClientLauncher externalClient; + + @Before + public void setUp() throws Exception { + // Start the external service + externalService = new HelloWorldServiceLauncher(); + externalService.createService(); + + // Start the SCA contribution + 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; + } + } + +/* + @Test + public void testWait() throws Exception { + System.out.println("Press a key"); + System.in.read(); + } +*/ + + @Test + public void testGetGreetings() throws Exception { + assertEquals("Hello Fred", externalClient.getGreetings("Fred")); + } + + @Test + @Ignore + public void testGetGreetingsException() throws Exception { + try { + externalClient.getGreetingsException("Fred"); + } catch (Exception ex) { + return; + } + + fail("expecting exception"); + } + + @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()); + } + + @After + public void tearDown() throws Exception { + node.stop(); + externalClient.destroyClient(); + externalService.destoryService(); + } + +} diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java deleted file mode 100644 index 2cf2422c8f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * 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.launcher.axis2; - -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.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public class WSDLFirstTestCaseOFF extends TestCase { - - private Node node; - - @Override - protected void setUp() throws Exception { - // Start the external service - HelloWorldServiceLauncher.main(null); - - // 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.start(); - } - - public void testCalculator() throws Exception { - HelloWorldClientLauncher.main(null); - } - -/* - public void testWait1() 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); - } - - public void testCalculator12() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator13() throws Exception { - HelloWorldClientLauncher.main(null); - } - - 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 { - node.stop(); - node = null; - } - -} -- cgit v1.2.3