diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-13 22:10:47 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-13 22:10:47 +0000 |
| commit | 5c5a7b298776e002c4d3f9b85bee5c0802c99252 (patch) | |
| tree | 4af58194d68783d28b96cac5c5c230a857e6f7c9 /branches | |
| parent | 946292048c3c76c0fbc0d0f54fd52598bce6e305 (diff) | |
Copy r799472 changes from 1.5.1 branch to 1.x branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814396 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
26 files changed, 1158 insertions, 12 deletions
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/pom.xml b/branches/sca-java-1.x/itest/domainmgr/callback/client/pom.xml new file mode 100644 index 0000000000..9e79ac05e7 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/client/pom.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-callback</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-callback-client</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Callback Client</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca-api</artifactId> + <version>1.5.1-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + </build> + +</project> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java b/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java new file mode 100644 index 0000000000..9937ea0b1e --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java b/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java new file mode 100644 index 0000000000..f22534e531 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java b/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java new file mode 100644 index 0000000000..412b3c7584 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java b/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java new file mode 100644 index 0000000000..0ec6acf2d1 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..1c37dd00b0 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:cb="http://simplecallback">
+ <deployable composite="cb:client" />
+</contribution>
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/client.composite b/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/client.composite new file mode 100644 index 0000000000..33842c3853 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/client.composite @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://simplecallback"
+ name="client">
+
+ <component name="MyClientComponent">
+ <implementation.java class="callbackclient.MyClientImpl" />
+ <reference name="myService" target="MyServiceComponent/MyService" />
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/pom.xml b/branches/sca-java-1.x/itest/domainmgr/callback/pom.xml new file mode 100644 index 0000000000..355c05293f --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-callback</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Callback</name> + + <packaging>pom</packaging> + <build> + <defaultGoal>install</defaultGoal> + </build> + <modules> + <module>service</module> + <module>client</module> + <module>runtest</module> + </modules> + +</project> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/pom.xml b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/pom.xml new file mode 100644 index 0000000000..fa03eaaabd --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/pom.xml @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-callback</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-callback-runtest</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Callback Run Test</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-callback-service</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-callback-client</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-domain-manager</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-sca-axis2</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <includes> + <include>**/*TestCase.java</include> + </includes> + <reportFormat>brief</reportFormat> + <useFile>false</useFile> + <forkMode>once</forkMode> + <argLine>-ea -Xmx256m</argLine> + <useSystemClassLoader>true</useSystemClassLoader> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java new file mode 100644 index 0000000000..6cd580676c --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java new file mode 100644 index 0000000000..157827f67e --- /dev/null +++ b/branches/sca-java-1.x/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(1000);
+ 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/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..4b2c664ed2 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite local="true" name="cloud" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"> + <include name="ns2:ServiceNode" + uri="http://tuscany.apache.org/cloud" + xmlns:ns2="http://tuscany.apache.org/cloud" /> + <include name="ns2:ClientNode" + uri="http://tuscany.apache.org/cloud" + xmlns:ns2="http://tuscany.apache.org/cloud" /> +</composite> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite new file mode 100644 index 0000000000..509bfafac1 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:c="http://simplecallback" + targetNamespace="http://tuscany.apache.org/cloud" + name="ClientNode"> + <component name="ClientNode"> + <t:implementation.node uri="callback-client" composite="c:client" /> + <service name="Node"> + <binding.sca uri="http://localhost:8081" /> + </service> + </component> +</composite> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite new file mode 100644 index 0000000000..1f1f0c47c2 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:c="http://simplecallback" + targetNamespace="http://tuscany.apache.org/cloud" + name="ServiceNode"> + <component name="ServiceNode"> + <t:implementation.node uri="callback-service" composite="c:service" /> + <service name="Node"> + <binding.sca uri="http://localhost:8082" /> + </service> + </component> +</composite> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..ba4d6bbf25 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite local="true" name="domain" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"> + <include name="ns2:service" + uri="callback-service" + xmlns:ns2="http://simplecallback" /> + <include name="ns2:client" + uri="callback-client" + xmlns:ns2="http://simplecallback" /> +</composite> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..6a6288e39c --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0"> + <contribution location="file:./cloud" + uri="http://tuscany.apache.org/cloud" /> + <contribution location="file:../../../../service/target/itest-domainmgr-callback-service.jar" + uri="callback-service" /> + <contribution location="file:../../../../client/target/itest-domainmgr-callback-client.jar" + uri="callback-client" /> +</workspace> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/pom.xml b/branches/sca-java-1.x/itest/domainmgr/callback/service/pom.xml new file mode 100644 index 0000000000..3a330b7deb --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/service/pom.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-callback</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-callback-service</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Callback Service</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca-api</artifactId> + <version>1.5.1-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + </build> + +</project> diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java b/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java new file mode 100644 index 0000000000..e5fbeb48ba --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java b/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java new file mode 100644 index 0000000000..896f6ca873 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java b/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java new file mode 100644 index 0000000000..1afbbfe934 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..517d022013 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:cb="http://simplecallback">
+ <deployable composite="cb:service" />
+</contribution>
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/service.composite b/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/service.composite new file mode 100644 index 0000000000..b84830795b --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/service.composite @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://simplecallback"
+ name="service">
+
+ <component name="MyServiceComponent">
+ <implementation.java class="callbackservice.MyServiceImpl" />
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/itest/domainmgr/pom.xml b/branches/sca-java-1.x/itest/domainmgr/pom.xml index 8fbd61d1e2..0e82cb4e62 100644 --- a/branches/sca-java-1.x/itest/domainmgr/pom.xml +++ b/branches/sca-java-1.x/itest/domainmgr/pom.xml @@ -38,5 +38,7 @@ <modules>
<module>basic</module>
<module>transaction</module>
+ <module>error</module>
+ <module>callback</module>
</modules>
</project>
diff --git a/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java b/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java index cc10fda63a..056149edbe 100644 --- a/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java +++ b/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java @@ -939,20 +939,51 @@ public abstract class BaseConfigurationBuilderImpl { // Initialize composite service binding URIs List<Service> compositeServices = composite.getServices(); for (Service service : compositeServices) { - // Set default binding names - + // Create default SCA binding if (service.getBindings().isEmpty()) { SCABinding scaBinding = createSCABinding(); service.getBindings().add(scaBinding); } - + + // Create default SCA callback binding + if (service.getInterfaceContract() != null + && service.getInterfaceContract().getCallbackInterface() != null + && service.getCallback() != null + && service.getCallback().getBindings().isEmpty()) { + SCABinding scaBinding = createSCABinding(); + scaBinding.setName(service.getName() + "Callback"); + service.getCallback().getBindings().add(scaBinding); + } + // Initialize binding names and URIs for (Binding binding : service.getBindings()) { constructBindingName(service, binding); constructBindingURI(parentComponentURI, composite, service, binding, defaultBindings); } } + + // Initialize composite reference callback binding URIs + for (Reference reference : composite.getReferences()) { + + // Create default SCA callback binding + if (reference.getInterfaceContract() != null + && reference.getInterfaceContract().getCallbackInterface() != null + && reference.getCallback() != null + && reference.getCallback().getBindings().isEmpty()) { + SCABinding scaBinding = createSCABinding(); + scaBinding.setName(reference.getName() + "Callback"); + reference.getCallback().getBindings().add(scaBinding); + } + + // Initialize binding names and URIs + if (reference.getCallback() != null) { + for (Binding binding : reference.getCallback().getBindings()) { + constructBindingName(reference, binding); + constructBindingURI(parentComponentURI, composite, reference, binding, defaultBindings); + } + } + } // Initialize component service binding URIs for (Component component : composite.getComponents()) { @@ -986,22 +1017,52 @@ public abstract class BaseConfigurationBuilderImpl { reconcileServices(component, services, componentServices); reconcileReferences(component, references, componentReferences); reconcileProperties(component, properties, componentProperties); - + for (ComponentService service : component.getServices()) { - + // Create default SCA binding if (service.getBindings().isEmpty()) { SCABinding scaBinding = createSCABinding(); service.getBindings().add(scaBinding); } + + // Create default SCA callback binding + if (service.getInterfaceContract() != null + && service.getInterfaceContract().getCallbackInterface() != null + && service.getCallback() != null + && service.getCallback().getBindings().isEmpty()) { + SCABinding scaBinding = createSCABinding(); + scaBinding.setName(service.getName() + "Callback"); + service.getCallback().getBindings().add(scaBinding); + } // Initialize binding names and URIs for (Binding binding : service.getBindings()) { - constructBindingName(service, binding); constructBindingURI(component, service, binding, defaultBindings); } - } + } + + for (ComponentReference reference : component.getReferences()) { + + // Create default SCA callback binding + if (reference.getInterfaceContract() != null + && reference.getInterfaceContract().getCallbackInterface() != null + && reference.getCallback() != null + && reference.getCallback().getBindings().isEmpty()) { + SCABinding scaBinding = createSCABinding(); + scaBinding.setName(reference.getName() + "Callback"); + reference.getCallback().getBindings().add(scaBinding); + } + + // Initialize binding names and URIs + if (reference.getCallback() != null) { + for (Binding binding : reference.getCallback().getBindings()) { + constructBindingName(reference, binding); + constructBindingURI(component, reference, binding, defaultBindings); + } + } + } } } @@ -1133,6 +1194,14 @@ public abstract class BaseConfigurationBuilderImpl { constructBindingURI(parentComponentURI, service, binding, includeBindingName, defaultBindings); } + private void constructBindingURI(String parentComponentURI, Composite composite, Reference reference, Binding binding, List<Binding> defaultBindings) + throws CompositeBuilderException{ + // This is a composite reference so there is no component to provide a component URI + // The path to this composite (through nested composites) is used. + boolean includeBindingName = true; + constructBindingURI(parentComponentURI, reference, binding, includeBindingName, defaultBindings); + } + /** * URI construction for component bindings based on Assembly Specification section 1.7.2. This method * calculates the component URI part based on component information before calling the generic @@ -1148,6 +1217,12 @@ public abstract class BaseConfigurationBuilderImpl { boolean includeBindingName = component.getServices().size() != 1; constructBindingURI(component.getURI(), service, binding, includeBindingName, defaultBindings); } + + private void constructBindingURI(Component component, Reference reference, Binding binding, List<Binding> defaultBindings) + throws CompositeBuilderException{ + boolean includeBindingName = true; + constructBindingURI(component.getURI(), reference, binding, includeBindingName, defaultBindings); + } /** * Generic URI construction for bindings based on Assembly Specification section 1.7.2 @@ -1159,7 +1234,7 @@ public abstract class BaseConfigurationBuilderImpl { * @param defaultBindings the list of default binding configurations * @throws CompositeBuilderException */ - private void constructBindingURI(String componentURIString, Service service, Binding binding, boolean includeBindingName, List<Binding> defaultBindings) + private void constructBindingURI(String componentURIString, Contract contract, Binding binding, boolean includeBindingName, List<Binding> defaultBindings) throws CompositeBuilderException{ try { @@ -1234,7 +1309,7 @@ public abstract class BaseConfigurationBuilderImpl { binding.setURI(constructBindingURI(baseURI, componentURI, bindingURI, includeBindingName, bindingName)); } catch (URISyntaxException ex) { - error("URLSyntaxException", binding, componentURIString, service.getName(), binding.getName()); + error("URLSyntaxException", binding, componentURIString, contract.getName(), binding.getName()); } } diff --git a/branches/sca-java-1.x/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/branches/sca-java-1.x/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java index 850fd77e96..fa5a9b062b 100644 --- a/branches/sca-java-1.x/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java +++ b/branches/sca-java-1.x/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java @@ -126,7 +126,7 @@ public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvi private ReferenceBindingProvider getDistributedProvider() { - if (isTargetRemote()) { + if (isTargetRemote() || isRemotableCallback()) { // initialize the remote provider if it hasn't been done already if (distributedProvider == null) { if (reference.getInterfaceContract() != null && !reference.getInterfaceContract().getInterface().isRemotable()) { @@ -155,6 +155,22 @@ public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvi return distributedProvider; } + /* + * This test is needed to make sure the distributed binding provider + * is started and stopped if this is a callback binding that might + * need to make a remote invocation. + */ + private boolean isRemotableCallback() { + if (reference.isCallback() && + reference.getInterfaceContract() != null && + reference.getInterfaceContract().getInterface().isRemotable() && + distributedProviderFactory != null) { + return true; + } else { + return false; + } + } + public InterfaceContract getBindingInterfaceContract() { if (isTargetRemote()) { return getDistributedProvider().getBindingInterfaceContract(); diff --git a/branches/sca-java-1.x/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/branches/sca-java-1.x/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java index 12566dc5e4..9f6019a1fd 100644 --- a/branches/sca-java-1.x/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java +++ b/branches/sca-java-1.x/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java @@ -71,7 +71,9 @@ public class IServiceImpl implements IService { @Init public void initIService() throws Exception { - initCalledCounter++; + synchronized (IServiceImpl.class) { + initCalledCounter++; + } if (p1.equals("p1") && a1.getName().equals("AService")) isInitReady = true; System.out.println("IService" + currentInstanceId + "->initIService"); @@ -79,7 +81,9 @@ public class IServiceImpl implements IService { @Destroy public void destroyIService() { - destroyCalledCounter++; + synchronized (IServiceImpl.class) { + destroyCalledCounter++; + } System.out.println("IService" + currentInstanceId + "->destroyIService"); } |