Author: slaws
Date: Fri May 14 14:56:39 2010
New Revision: 944302
URL: http://svn.apache.org/viewvc?rev=944302&view=rev
Log:
Add an OSGi based launcher. Does the same thing as the JSE laucher except using
node launcher equinox
Added:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/ (with props)
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/pom.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
Propchange: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 14 14:56:39 2010
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml?rev=944302&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/build.xml Fri May
14 14:56:39 2010
@@ -0,0 +1,71 @@
+<!--
+ * 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 name="binding-ws-calculator" default="run">
+ <property name="tuscany.home" value="../.."/>
+ <property name="jar.name" value="sample-launcher-embedded-jse.jar" />
+ <property name="main.class" value="launcher.SampleJSELauncher" />
+
+ <echo>${tuscany.home}</echo>
+
+ <target name="init">
+ <delete quiet="true" includeemptydirs="true">
+ <fileset dir="target"/>
+ </delete>
+ <mkdir dir="target/classes"/>
+ </target>
+
+ <target name="compile" depends="init">
+ <javac srcdir="src/main/java"
+ destdir="target/classes"
+ debug="on"
+ source="1.5"
+ target="1.5"
+ failonerror="true">
+ <classpath>
+ <fileset dir="${tuscany.home}/lib">
+ <include name="tuscany-base-*.jar" />
+ </fileset>
+ </classpath>
+ </javac>
+ <jar destfile="target/${jar.name}" basedir="target/classes">
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="run" depends="compile">
+ <echo>Please use 'ant run-name-of-sample-contribution-to-run'
</echo>
+ </target>
+
+ <target name="run-binding-ws-calculator" depends="compile">
+ <java classname="${main.class}"
+ fork="true"
+ failonerror="true">
+ <classpath>
+ <pathelement location="target/${jar.name}"/>
+ <fileset dir="${tuscany.home}/features">
+ <include name="tuscany-sca-manifest.jar" />
+ </fileset>
+ </classpath>
+ <arg value="binding-ws-calculator"/>
+ </java>
+ </target>
+
+</project>
Added: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/pom.xml?rev=944302&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/pom.xml Fri May
14 14:56:39 2010
@@ -0,0 +1,76 @@
+<?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>tuscany-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>sample-launcher-embedded-osgi</artifactId>
+ <name>Apache Tuscany SCA Sample Embedded Launcher OSGi</name>
+
+ <repositories>
+ <repository>
+ <id>apache.incubator</id>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-feature-api</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-feature-core</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-feature-binding-ws</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+
+ <plugins>
+
+ </plugins>
+ </build>
+</project>
Added:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java?rev=944302&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
(added)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
Fri May 14 14:56:39 2010
@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+
+/**
+ * The Calculator service interface.
+ */
+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);
+
+}
Added:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java?rev=944302&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
(added)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
Fri May 14 14:56:39 2010
@@ -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();
+ }
+
+}
Added:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java?rev=944302&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
(added)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
Fri May 14 14:56:39 2010
@@ -0,0 +1,90 @@
+/*
+ * 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 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",
"../contribution-binding-sca-calculator/target/classes"));
+
+ //CalculatorService calculator =
node.getService(CalculatorService.class, "CalculatorServiceComponent");
+ // TODO - could use JUnit assertions but don't want to have to handle
JUnit dependency from Ant script
+ //double result = calculator.add(3, 2);
+ //System.out.println("3 + 2 = " + result);
+ //if (result != 5.0){
+ // throw new SampleLauncherException();
+ //}
+ stopNode(node);
+ }
+
+ /*
+ * Using a Tuscany specific mechanism for getting at local service proxies
+ */
+ public void launchBindingWSCalculator(){
+ Node node = startNode(new Contribution("c1",
"../contribution-binding-ws-calculator/target/classes"));
+
+ CalculatorService calculator =
node.getService(CalculatorService.class, "CalculatorServiceComponent");
+ // TODO - could use JUnit assertions but don't want to have to handle
JUnit dependency from Ant script
+ double result = calculator.add(3, 2);
+ System.out.println("3 + 2 = " + result);
+ if (result != 5.0){
+ throw new SampleLauncherException();
+ }
+
+ stopNode(node);
+ }
+
+}
Added:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java?rev=944302&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
(added)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
Fri May 14 14:56:39 2010
@@ -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);
+ }
+
+}
Added:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java?rev=944302&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
(added)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
Fri May 14 14:56:39 2010
@@ -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"});
+ }
+}
