From 147e55af252ea8ee020fb6bee3fe37dd2b556f63 Mon Sep 17 00:00:00 2001 From: slaws Date: Wed, 16 Jun 2010 10:18:20 +0000 Subject: Add callback test case. Different from the otest in that it's testing SCA to SCA callbacks. I may combine this with the itest/callback-ws test we already have but that's testing different SCDL combinations at the moment. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@955180 13f79535-47bb-0310-9956-ffa450edef68 --- .../trunk/itest/ws/contribution-callback/pom.xml | 123 +++++++++++++++++++++ .../apache/tuscany/sca/binding/ws/HelloWorld.java | 32 ++++++ .../tuscany/sca/binding/ws/HelloWorldCallback.java | 31 ++++++ .../sca/binding/ws/HelloWorldCallbackService.java | 34 ++++++ .../binding/ws/HelloWorldCallbackServiceImpl.java | 53 +++++++++ .../tuscany/sca/binding/ws/HelloWorldImpl.java | 84 ++++++++++++++ .../resources/HelloWorldServiceService_schema1.xsd | 70 ++++++++++++ .../main/resources/META-INF/sca-contribution.xml | 23 ++++ .../resources/helloworld-external-service.wsdl | 75 +++++++++++++ .../src/main/resources/helloworld.composite | 45 ++++++++ .../ws/launcher/axis2/CallbackTestCase.java | 112 +++++++++++++++++++ sca-java-2.x/trunk/itest/ws/pom.xml | 1 + 12 files changed, 683 insertions(+) create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/pom.xml create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl create mode 100644 sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld.composite create mode 100644 sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java (limited to 'sca-java-2.x/trunk/itest') diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback/pom.xml new file mode 100644 index 0000000000..efdd580b18 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/pom.xml @@ -0,0 +1,123 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-itest + 2.0-SNAPSHOT + ../pom.xml + + + itest-ws-contribution-callback + Apache Tuscany SCA iTest WS Contribution Callback + + + + + org.apache.tuscany.sca + tuscany-feature-core + pom + 2.0-SNAPSHOT + + + + + + ${artifactId} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.0 + + + add-source + generate-sources + + add-test-source + + + + target/jaxws-source + + + + + + + org.codehaus.mojo + jaxws-maven-plugin + 1.12 + + + + javax.jws + jsr181-api + 1.0-MR1 + + + javax.annotation + jsr250-api + 1.0 + + + + + wsgen1 + process-classes + + wsgen + + + org.apache.tuscany.sca.binding.ws.HelloWorldImpl + true + ${project.build.directory}/jaxws/stale/.wsgen1StaleFlag + + + + wsimport1 + process-resources + + wsimport + + + org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface + ${basedir}/target/classes + + helloworld-external-service.wsdl + + ${project.build.directory}/jaxws/stale/.wsimport1StaleFlag + + + + + 2.1 + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source + true + true + + + + + diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/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-callback/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-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java new file mode 100644 index 0000000000..ba117c8cfd --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java @@ -0,0 +1,31 @@ +/* + * 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.annotation.Remotable; + +@Remotable +public interface HelloWorldCallback { + + String getGreetingsCallback(String s); + Foo getGreetingsComplexCallback(Foo foo); + +} diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java new file mode 100644 index 0000000000..3521fa5624 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java @@ -0,0 +1,34 @@ +/* + * 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.Callback; +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +@Callback(HelloWorldCallback.class) +public interface HelloWorldCallbackService { + + 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-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java new file mode 100644 index 0000000000..057b884bc9 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.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 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.Callback; +import org.oasisopen.sca.annotation.Service; + +@Service(HelloWorldCallbackService.class) +public class HelloWorldCallbackServiceImpl implements HelloWorldCallbackService { + + @Callback + protected HelloWorldCallback helloWorldCallback; + + public String getGreetings(String s) { + System.out.println("Entering SCA HelloWorldCallbackService.getGreetings: " + s); + String response = helloWorldCallback.getGreetingsCallback(s); + System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response); + return response; + } + + public String getGreetingsException(String s) throws ServiceRuntimeException { + System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsException: " + s); + String response = helloWorldCallback.getGreetingsCallback(s); + System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response); + throw new ServiceRuntimeException(response); + } + + public Foo getGreetingsComplex(Foo foo){ + System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS()); + Foo response = helloWorldCallback.getGreetingsComplexCallback(foo); + System.out.println("Leaving SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS()); + return response; + } +} diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java new file mode 100644 index 0000000000..1ff58a29b0 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java @@ -0,0 +1,84 @@ +/* + * 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 javax.jws.WebService; + +import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo; +import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Reference; + +@WebService +public class HelloWorldImpl implements HelloWorld, HelloWorldCallback { + + @Reference + public HelloWorldService helloWorldExternal; + + @Reference + public HelloWorldCallbackService helloWorldCallbackService; + + // HelloWorld operations + + public String getGreetings(String s) { + System.out.println("Entering SCA HelloWorld.getGreetings: " + s); + String response = helloWorldCallbackService.getGreetings(s); + 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 = helloWorldCallbackService.getGreetings(s); + System.out.println("Leaving SCA HelloWorld.getGreetings: " + response); + throw new ServiceRuntimeException(response); + } + + public Foo getGreetingsComplex(Foo foo){ + System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS()); + Foo response = helloWorldCallbackService.getGreetingsComplex(foo); + System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS()); + return response; + } + + // HelloWorldCallback operations + + public String getGreetingsCallback(String s) { + System.out.println("Entering SCA HelloWorld.getGreetingsCallback: " + s); + String response = helloWorldExternal.getGreetings(s); + System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response); + return response; + } + + public String getGreetingsExceptionCallback(String s) throws ServiceRuntimeException { + System.out.println("Entering SCA HelloWorld.getGreetingsExceptionCallback: " + s); + String response = helloWorldExternal.getGreetings(s); + System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response); + throw new ServiceRuntimeException(response); + } + + public Foo getGreetingsComplexCallback(Foo foo){ + System.out.println("Entering SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS()); + Foo response = helloWorldExternal.getGreetingsComplex(foo); + System.out.println("Leaving SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS()); + return response; + } + +} diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd new file mode 100644 index 0000000000..acdfcaaaa5 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..350ad6be96 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl new file mode 100644 index 0000000000..837bcb059e --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..2335192875 --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld.composite @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java new file mode 100644 index 0000000000..3bd65d549a --- /dev/null +++ b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java @@ -0,0 +1,112 @@ +/* + * 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 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 CallbackTestCase { + + 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("java-first", "../contribution-callback/target/itest-ws-contribution-callback.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 + 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/pom.xml b/sca-java-2.x/trunk/itest/ws/pom.xml index 1b76f7ad56..8795fe3783 100644 --- a/sca-java-2.x/trunk/itest/ws/pom.xml +++ b/sca-java-2.x/trunk/itest/ws/pom.xml @@ -46,6 +46,7 @@ contribution-java-first contribution-wsdl-first + contribution-callback external-client external-service launcher-axis2 -- cgit v1.2.3