From 1c0d8a7ab823150bdbece285e71cd6f414621cfc Mon Sep 17 00:00:00 2001 From: antelder Date: Mon, 27 Dec 2010 10:50:45 +0000 Subject: Start branch for beta2 release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1053042 13f79535-47bb-0310-9956-ffa450edef68 --- .../running-tuscany/embedded-osgi-base/README | 24 ++++++ .../running-tuscany/embedded-osgi-base/build.xml | 97 ++++++++++++++++++++++ .../running-tuscany/embedded-osgi-base/pom.xml | 71 ++++++++++++++++ .../main/java/calculator/CalculatorService.java | 38 +++++++++ .../src/main/java/launcher/RuntimeIntegration.java | 61 ++++++++++++++ .../src/main/java/launcher/SampleJSELauncher.java | 89 ++++++++++++++++++++ .../java/launcher/SampleLauncherException.java | 42 ++++++++++ .../src/test/java/launcher/LauncherTestCase.java | 39 +++++++++ 8 files changed, 461 insertions(+) create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/README create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/build.xml create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/pom.xml create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/calculator/CalculatorService.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/RuntimeIntegration.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleLauncherException.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/test/java/launcher/LauncherTestCase.java (limited to 'sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base') diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/README b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/README new file mode 100644 index 0000000000..362d6032d2 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/README @@ -0,0 +1,24 @@ +OSGI Sample Launcher +=================== + +This directory contains a sample launcher for the running the +tuscany sample contributions in an OSGI environment. + +The difference between this sample and the sample with the name without the +-base suffix is that this one uses the Tuscany aggregated jar to minimize the +jars a user needs to use. + +The README file in the /samples directory provides +general instructions about building and running sample contributions using the +tuscany sample launchers. ( where +distribution-unpack-dir is the directory in which you unpacked the tuscany +binary distribution archive) + +To use this sample OSGI launcher with ant excute the command + +ant run- + +where run- is one of the targets in the build.xml file + +To use this sample launcher to run all of the contributions as junit test cases, +execute the command "mvn" in the launcher directory. diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/build.xml b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/build.xml new file mode 100644 index 0000000000..352ab46883 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/build.xml @@ -0,0 +1,97 @@ + + + + + + + ${tuscany.home} + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please use 'ant run-name-of-sample-contribution-to-run' for example, try one of + 'ant run-contribution-binding-sca-calculator' + + + + + + + + + + + + + + + and ant run + + + + + diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/pom.xml b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/pom.xml new file mode 100644 index 0000000000..ba57a79f3a --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/pom.xml @@ -0,0 +1,71 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples-running-tuscany + 2.0-Beta2-SNAPSHOT + ../pom.xml + + sample-launcher-embedded-osgi-base + Apache Tuscany SCA Sample Launcher Embedded OSGi using base jar + + + + org.apache.tuscany.sca + tuscany-base-runtime-nodep + 2.0-Beta2-SNAPSHOT + + + commons-cli + commons-cli + 1.2 + + + org.eclipse + osgi + 3.5.0-v20090520 + compile + + + org.eclipse.osgi + services + 3.2.0-v20090520-1800 + compile + + + + junit + junit + 4.8.1 + test + + + + + + ${artifactId} + + + + + + diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/calculator/CalculatorService.java new file mode 100644 index 0000000000..a59a7c3b16 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/calculator/CalculatorService.java @@ -0,0 +1,38 @@ +/* + * 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 calculator; + +import org.oasisopen.sca.annotation.Remotable; + + +/** + * The Calculator service interface. + */ +@Remotable +public interface CalculatorService { + + double add(double n1, double n2); + + double subtract(double n1, double n2); + + double multiply(double n1, double n2); + + double divide(double n1, double n2); + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/RuntimeIntegration.java new file mode 100644 index 0000000000..2c1cdf187a --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/RuntimeIntegration.java @@ -0,0 +1,61 @@ +/* + * 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 launcher; + +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.equinox.launcher.LauncherException; +import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; + + +/** + * OSGi launcher function + */ +public class RuntimeIntegration { + + public Node startNode(Contribution... contributions){ + NodeLauncher launcher = NodeLauncher.newInstance(); + + // TODO - why do we have 3 different versions of the Contribution class? + org.apache.tuscany.sca.node.equinox.launcher.Contribution equinoxContributions[] = + new org.apache.tuscany.sca.node.equinox.launcher.Contribution[contributions.length]; + int i = 0; + for (Contribution inContrib : contributions) { + org.apache.tuscany.sca.node.equinox.launcher.Contribution outContrib = + new org.apache.tuscany.sca.node.equinox.launcher.Contribution(inContrib.getURI(), inContrib.getLocation()); + equinoxContributions[i] = outContrib; + i++; + } + Node node = null; + + try { + node = launcher.createNode(null, equinoxContributions); + } catch (LauncherException ex) { + throw new SampleLauncherException(ex.getMessage()); + } + node.start(); + return node; + } + + public void stopNode(Node node){ + node.stop(); + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java new file mode 100644 index 0000000000..4d8ea7f86a --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java @@ -0,0 +1,89 @@ +/* + * 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 launcher; + +import java.net.URI; + +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.Node; +import org.oasisopen.sca.NoSuchDomainException; +import org.oasisopen.sca.NoSuchServiceException; +import org.oasisopen.sca.client.SCAClientFactory; + +import calculator.CalculatorService; + + +/** + * This client program shows how to create an embedded SCA runtime, start it, + * and locate and invoke a SCA component + */ +public class SampleJSELauncher extends RuntimeIntegration { + + public static void main(String[] args) throws Exception { + SampleJSELauncher launcher = new SampleJSELauncher(); + + String contribution = null; + + if (args == null || args.length != 1){ + System.out.println("Please provide the name of the sample contribution to run as a parameter"); + System.out.println("Running binding-sca-calculator by default"); + contribution = "contribution-binding-sca-calculator"; + } else { + contribution = args[0]; + } + + if (contribution.equals("contribution-binding-sca-calculator")){ + launcher.launchBindingSCACalculator(); + } else if (contribution.equals("contribution-binding-ws-calculator")){ + launcher.launchBindingWSCalculator(); + } else { + System.out.println("Sample contribution " + contribution + "not found"); + } + + } + + /** + * The contribution-binding-sca-calculator contribution includes a client component + * that calls the CalculatorServiceComponent from an operation marked by @Init. + */ + public void launchBindingSCACalculator(){ + Node node = startNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-binding-sca-calculator-contribution.jar")); + + stopNode(node); + } + + /* + * Using a Tuscany specific mechanism for getting at local service proxies + */ + public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{ + Node node = startNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-binding-ws-calculator-contribution.jar")); + + CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent"); + + double result = calculator.add(3, 2); + System.out.println("3 + 2 = " + result); + if (result != 5.0){ + throw new SampleLauncherException(); + } + + stopNode(node); + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleLauncherException.java new file mode 100644 index 0000000000..1eacb94b19 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleLauncherException.java @@ -0,0 +1,42 @@ +/* + * 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 launcher; + +/** + * This exception signals problems in the management of SCA component execution. + */ +public class SampleLauncherException extends RuntimeException { + /** + * Constructs a SampleLauncherException with no detail message. + */ + public SampleLauncherException() { + super(); + } + + /** + * Constructs a SampleLauncherException with the specified detail + * message. + * + * @param message the detail message + */ + public SampleLauncherException(String message) { + super(message); + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/test/java/launcher/LauncherTestCase.java new file mode 100644 index 0000000000..9228d33018 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/embedded-osgi-base/src/test/java/launcher/LauncherTestCase.java @@ -0,0 +1,39 @@ +/* + * 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 launcher; + +import org.junit.Test; + + + +/** + * Test the Calculator composition. + */ +public class LauncherTestCase { + + @Test + public void testContributionBindingSCACalculator() throws Exception { + SampleJSELauncher.main(new String[] {"contribution-binding-sca-calculator"}); + } + + @Test + public void testContributionBindingWSCalculator() throws Exception { + SampleJSELauncher.main(new String[] {"contribution-binding-ws-calculator"}); + } +} -- cgit v1.2.3