From 3a569a2f00bf172cddfd567149774ee808a2a242 Mon Sep 17 00:00:00 2001 From: nash Date: Wed, 30 Mar 2011 19:50:51 +0000 Subject: Create branch for 1.6.2 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1087059 13f79535-47bb-0310-9956-ffa450edef68 --- .../itest/domainmgr/callback/client/pom.xml | 51 +++ .../src/main/java/callbackclient/MyClientImpl.java | 52 +++ .../src/main/java/callbackclient/MyService.java | 34 ++ .../java/callbackclient/MyServiceCallback.java | 30 ++ .../src/main/java/callbackclient/TestService.java | 29 ++ .../main/resources/META-INF/sca-contribution.xml | 23 ++ .../client/src/main/resources/client.composite | 29 ++ .../itest/domainmgr/callback/pom.xml | 41 +++ .../itest/domainmgr/callback/runtest/pom.xml | 97 ++++++ .../src/test/java/callbacktest/TestService.java | 29 ++ .../domainmgr/DomainManagerCallbackTestCase.java | 358 +++++++++++++++++++++ .../src/test/resources/domain/cloud.composite | 30 ++ .../resources/domain/cloud/ClientNode.composite | 31 ++ .../resources/domain/cloud/ServiceNode.composite | 31 ++ .../src/test/resources/domain/domain.composite | 30 ++ .../src/test/resources/domain/workspace.xml | 28 ++ .../itest/domainmgr/callback/service/pom.xml | 51 +++ .../src/main/java/callbackservice/MyService.java | 34 ++ .../java/callbackservice/MyServiceCallback.java | 30 ++ .../main/java/callbackservice/MyServiceImpl.java | 50 +++ .../main/resources/META-INF/sca-contribution.xml | 23 ++ .../service/src/main/resources/service.composite | 28 ++ 22 files changed, 1139 insertions(+) create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/pom.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/resources/client.composite create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/pom.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/pom.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/pom.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/resources/service.composite (limited to 'sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback') diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/pom.xml new file mode 100644 index 0000000000..dccba3b9e1 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-callback + 1.6.1-SNAPSHOT + ../pom.xml + + itest-domainmgr-callback-client + Apache Tuscany SCA iTest Domain Manager Callback Client + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.6.1-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.6.1-SNAPSHOT + runtime + + + + + + ${artifactId} + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java new file mode 100644 index 0000000000..9937ea0b1e --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java @@ -0,0 +1,52 @@ +/* + * 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 callbackclient; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +/** + * Demonstrates a component-to-component callback invocation + */ +@Service(TestService.class) +public class MyClientImpl implements TestService { + + private MyService myService; + private static String result; + + @Reference + protected void setMyService(MyService myService) { + this.myService = myService; + } + + public void runTest() { + System.out.println("MyClientImpl.runTest"); + myService.someMethod("-> someMethod"); + } + + public String getResult() { + System.out.println("MyClientImpl.getResult"); + return MyClientImpl.result; + } + + public void receiveResult(String result) { + System.out.println("MyClientImpl.receiveResult: result=" + result); + MyClientImpl.result = result; + } +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java new file mode 100644 index 0000000000..f22534e531 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.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 callbackclient; + +import org.osoa.sca.annotations.Callback; +import org.osoa.sca.annotations.OneWay; +import org.osoa.sca.annotations.Remotable; + +/** + * This service that will be invoked in a non-blocking fashion + */ +@Remotable +@Callback(MyServiceCallback.class) +public interface MyService { + + @OneWay + void someMethod(String arg); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java new file mode 100644 index 0000000000..412b3c7584 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java @@ -0,0 +1,30 @@ +/* + * 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 callbackclient; + +import org.osoa.sca.annotations.Remotable; + +/** + * The callback interface for {@link MyService}. + */ +@Remotable +public interface MyServiceCallback { + + void receiveResult(String result); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java new file mode 100644 index 0000000000..0ec6acf2d1 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java @@ -0,0 +1,29 @@ +/* + * 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 callbackclient; + +/** + * Test driver interface + */ +public interface TestService { + + void runTest(); + + String getResult(); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..1c37dd00b0 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/resources/client.composite b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/resources/client.composite new file mode 100644 index 0000000000..33842c3853 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/client/src/main/resources/client.composite @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/pom.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/pom.xml new file mode 100644 index 0000000000..f8532fedde --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr + 1.6.1-SNAPSHOT + ../pom.xml + + itest-domainmgr-callback + Apache Tuscany SCA iTest Domain Manager Callback + + pom + + install + + + service + client + runtest + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/pom.xml new file mode 100644 index 0000000000..83d2c19d97 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/pom.xml @@ -0,0 +1,97 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-callback + 1.6.1-SNAPSHOT + ../pom.xml + + itest-domainmgr-callback-runtest + Apache Tuscany SCA iTest Domain Manager Callback Run Test + + + + org.apache.tuscany.sca + itest-domainmgr-callback-service + 1.6.1-SNAPSHOT + provided + + + + org.apache.tuscany.sca + itest-domainmgr-callback-client + 1.6.1-SNAPSHOT + provided + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.6.1-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-domain-manager + 1.6.1-SNAPSHOT + test + + + + org.apache.tuscany.sca + tuscany-binding-sca-axis2 + 1.6.1-SNAPSHOT + test + + + + junit + junit + 4.5 + test + + + + + + ${artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + 2.3.1 + + + **/*TestCase.java + + brief + false + once + -ea -Xmx256m + true + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java new file mode 100644 index 0000000000..6cd580676c --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java @@ -0,0 +1,29 @@ +/* + * 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 callbacktest; + +/** + * Test driver interface + */ +public interface TestService { + + void runTest(); + + String getResult(); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java new file mode 100644 index 0000000000..42665657d0 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java @@ -0,0 +1,358 @@ +/* + * 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 domainmgr; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode; +import org.apache.tuscany.sca.node.SCANodeFactory; +import org.junit.Test; +import callbacktest.TestService; + +import static org.junit.Assert.*; + +/** + * Starts the Romain Manager with a test configuration, then starts + * a test node that reads a deployed composite. The domain manager + * should read and configure the composite and send it to the node + * without detecting or reporting any errors. + */ +public class DomainManagerCallbackTestCase { + + private String home = System.getProperty("java.home"); + private String classpath = System.getProperty("java.class.path"); + private Runtime runtime = Runtime.getRuntime(); + private BufferedReader domainErrReader; + private BufferedReader domainOutReader; + + @Test + public void test() throws Exception { + + Process domainMgr = null; + TestNode otherNode = null; + + try { + // Start the domain manager process in its own working directory of + // "target/test-classes/domain/" to ensure no interference with the + // node processes. The predefined domain config is copied by mvn + // from the "src/test/resources/domain/" directory. + System.out.println("Starting domain manager"); + String[] domainCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; + String userdir = System.getProperty("user.dir"); + domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the domain manager process. + InputStream domainErr = domainMgr.getErrorStream(); + domainErrReader = new BufferedReader(new InputStreamReader(domainErr)); + InputStream domainOut = domainMgr.getInputStream(); + domainOutReader = new BufferedReader(new InputStreamReader(domainOut)); + OutputStream domainIn = domainMgr.getOutputStream(); + + // Read startup log output from the domain manager process. The log + // output is written to the process's stderr. + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // domain manager started successfully + System.out.println("Domain manager started successfully"); + break; + } + } + checkDomainOut(); + + // Start the test nodes. Each node runs in its own "target" directory + // to ensure no interference with other processes. + otherNode = new TestNode("ServiceNode", userdir + "/../service/target/"); + otherNode.start(); + + // Start the client node. This runs in the current process so that + // we can use the SCAClient API to invoke its services. The current + // working directory is "runtest" which means there is no interference + // other processes. + SCANode thisNode = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode"); + checkDomainErr(); + checkDomainOut(); + thisNode.start(); + + // Run the client test code. + TestService tester = ((SCAClient)thisNode).getService(TestService.class, "MyClientComponent/TestService"); + tester.runTest(); + otherNode.checkNodeErr(); + otherNode.checkNodeOut(); + System.out.println("Sleeping ..."); + Thread.sleep(14000); + otherNode.checkNodeErr(); + otherNode.checkNodeOut(); + assertEquals("-> someMethod -> receiveResult", tester.getResult()); + + // Stop the client node. + thisNode.stop(); + + // Stop the test nodes. + otherNode.stopNode(); + otherNode = null; + + // Stop the domain manager by sending 'q' to stdin. + System.out.println("Stopping domain manager"); + domainIn.write('q'); + domainIn.flush(); + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: SCA Domain Manager is now stopped.")) { + // domain manager stopped successfully + System.out.println("Domain manager stopped successfully"); + break; + } + } + checkDomainOut(); + + // Wait for domain manager process to end, and check its exit value. + int value = domainMgr.waitFor(); + if (value != 0) { + throw new IllegalStateException("Domain Manager process exit value " + value); + } + domainMgr = null; + + } finally { + // If the test nodes did not shut down cleanly, destroy the test + // node processes. + if (otherNode != null) { + otherNode.destroyNode(); + } + + // If the domain manager did not shut down cleanly, destroy the + // domain manager process. + if (domainMgr != null) { + System.out.println("Destroying domain"); + checkDomainErr(true); + checkDomainOut(); + try { + domainMgr.destroy(); + } catch (Exception e) { + } + } + } + } + + /* + * Check stderr for the domain manager process. Called periodically + * to ensure that anything written to stderr is displayed in the test log + * and abort execution if the domain manager has logged any errors. + */ + private void checkDomainErr(boolean nothrow) throws Exception { + while (domainErrReader.ready()) { + String line = domainErrReader.readLine(); + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:") && !nothrow) { + throw new IllegalStateException("Domain manager reported error: " + line); + } + } + } + + private void checkDomainErr() throws Exception { + checkDomainErr(false); + } + + /* + * Check stdout for the domain manager process. Called periodically + * to ensure that anything written to stdout is displayed in the test log. + */ + private void checkDomainOut() throws Exception { + while (domainOutReader.ready()) { + String line = domainOutReader.readLine(); + System.out.println("DomainMgr.o: " + line); + } + } + + /* + * Internal class representing a test node. + */ + private class TestNode { + + String nodeName; + String nodeDir; + BufferedReader nodeErrReader; + BufferedReader nodeOutReader; + OutputStream nodeIn; + Process nodeProcess; + + TestNode(String nodeName, String nodeDir) { + this.nodeName = nodeName; + this.nodeDir = nodeDir; + } + + /* + * Start the test node. + */ + void start() throws Exception { + System.out.println("Starting node " + nodeName); + String[] nodeCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.NodeLauncher", + "http://localhost:9990/node-config/" + nodeName}; + nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir)); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the test node process. + InputStream nodeErr = nodeProcess.getErrorStream(); + nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr)); + InputStream nodeOut = nodeProcess.getInputStream(); + nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut)); + nodeIn = nodeProcess.getOutputStream(); + + // Read startup log output from the test node process. The log + // output is written to the process's stderr. + while (true) { + Thread.sleep(100); + checkDomainErr(); + checkDomainOut(); + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // test node started successfully + System.out.println("Node " + nodeName + " started successfully"); + break; + } + } + checkDomainErr(); + checkDomainOut(); + checkNodeOut(); + } + + /* + * Check stderr for the test node process. Called periodically to + * ensure that anything written to stderr is displayed in the test log + * and abort execution if the test node has logged any errors. + */ + void checkNodeErr(boolean nothrow) throws Exception { + while (nodeErrReader.ready()) { + String line = nodeErrReader.readLine(); + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:") && !nothrow) { + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + } + } + + void checkNodeErr() throws Exception { + checkNodeErr(false); + } + + /* + * Check stdout for the test node process. Called periodically to + * ensure that anything written to stdout is displayed in the test log. + */ + void checkNodeOut() throws Exception { + while (nodeOutReader.ready()) { + String line = nodeOutReader.readLine(); + System.out.println(nodeName + ".o: " + line); + } + } + + /* + * Stop the test node process. + */ + void stopNode() throws Exception { + System.out.println("Stopping node " + nodeName); + nodeIn.write('q'); + nodeIn.flush(); + while (true) { + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: SCA Node is now stopped.")) { + // test node stopped successfully + System.out.println("Node " + nodeName + " stopped successfully"); + break; + } + } + checkNodeOut(); + + // Wait for test node process to end, and check its exit value. + int value = nodeProcess.waitFor(); + if (value != 0) { + throw new IllegalStateException("Node " + nodeName + " exit value " + value); + } + } + + /* + * Destroy the test node process. + */ + void destroyNode() throws Exception { + if (nodeProcess != null) { + System.out.println("Destroying node " + nodeName); + checkNodeErr(true); + checkNodeOut(); + try { + nodeProcess.destroy(); + } catch (Exception e) { + } + } + } + } + +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..eb8b5796f2 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite @@ -0,0 +1,30 @@ + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite new file mode 100644 index 0000000000..cc8b8ef632 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite @@ -0,0 +1,31 @@ + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite new file mode 100644 index 0000000000..cf33e9f975 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite @@ -0,0 +1,31 @@ + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..800eab2c57 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite @@ -0,0 +1,30 @@ + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..c9f5f84c58 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/pom.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/pom.xml new file mode 100644 index 0000000000..50a4b2ab65 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-callback + 1.6.1-SNAPSHOT + ../pom.xml + + itest-domainmgr-callback-service + Apache Tuscany SCA iTest Domain Manager Callback Service + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.6.1-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.6.1-SNAPSHOT + runtime + + + + + + ${artifactId} + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java new file mode 100644 index 0000000000..e5fbeb48ba --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.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 callbackservice; + +import org.osoa.sca.annotations.Callback; +import org.osoa.sca.annotations.OneWay; +import org.osoa.sca.annotations.Remotable; + +/** + * This service that will be invoked in a non-blocking fashion + */ +@Remotable +@Callback(MyServiceCallback.class) +public interface MyService { + + @OneWay + void someMethod(String arg); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java new file mode 100644 index 0000000000..896f6ca873 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java @@ -0,0 +1,30 @@ +/* + * 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 callbackservice; + +import org.osoa.sca.annotations.Remotable; + +/** + * The callback interface for {@link MyService}. + */ +@Remotable +public interface MyServiceCallback { + + void receiveResult(String result); +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java new file mode 100644 index 0000000000..1afbbfe934 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java @@ -0,0 +1,50 @@ +/* + * 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 callbackservice; + +import org.osoa.sca.annotations.Callback; + +/** + * This class implements MyService and uses a callback. + */ +public class MyServiceImpl implements MyService { + + private MyServiceCallback myServiceCallback; + + /** + * The setter used by the runtime to set the callback reference + * @param myServiceCallback + */ + @Callback + protected void setMyServiceCallback(MyServiceCallback myServiceCallback) { + this.myServiceCallback = myServiceCallback; + } + + public void someMethod(String arg) { + System.out.println("MyServiceImpl.someMethod"); + // invoke the callback + try { + myServiceCallback.receiveResult(arg + " -> receiveResult"); + System.out.println("MyServiceImpl.someMethod returned from receiveResult() call"); + } catch (RuntimeException e) { + System.out.println("MyServiceImpl.someMethod exception invoking receiveResult: " + e.toString()); + } + } + +} diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..517d022013 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/resources/service.composite b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/resources/service.composite new file mode 100644 index 0000000000..b84830795b --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/domainmgr/callback/service/src/main/resources/service.composite @@ -0,0 +1,28 @@ + + + + + + + + + -- cgit v1.2.3