tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r1165595 - in /tuscany/sca-java-2.x/trunk/samples: learning-more/ learning-more/contribution-osgi/ learning-more/contribution-osgi/META-INF/ learning-more/contribution-osgi/src/ learning-more/contribution-osgi/src/main/ learning-more/contri...
Date Tue, 06 Sep 2011 10:31:33 GMT
Author: slaws
Date: Tue Sep  6 10:31:32 2011
New Revision: 1165595

URL: http://svn.apache.org/viewvc?rev=1165595&view=rev
Log:
TUSCANY-3938 - Add samples to demonstrate starting the runtime in OSGi.

Added:
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/   (with props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/META-INF/   (with props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README.odt   (with
props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/   (with props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/   (with props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/   (with
props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/
  (with props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/resources/
  (with props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/   (with props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/   (with
props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/calculator/
  (with props)
    tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/osgi/   (with props)
    tuscany/sca-java-2.x/trunk/samples/running-tuscany/osgi/README.odt   (with props)
Modified:
    tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep  6 10:31:32 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/META-INF/
------------------------------------------------------------------------------
    bugtraq:number = true

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/META-INF/MANIFEST.MF
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-Version: 2.0.0
+Bundle-Name: Sample Calculator OSGi
+Bundle-Activator: calculator.CalculatorActivator
+Bundle-ManifestVersion: 2
+Import-Package: org.oasisopen.sca.annotation;version="2.0.0",
+ org.apache.tuscany.sca;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.osgi.framework,
+ org.osgi.service.component;resolution:=optional,
+ org.osgi.service.packageadmin,
+ org.osgi.util.tracker
+Bundle-SymbolicName: sample.calculator.osgi
+Bundle-Vendor: The Apache Software Foundation
+Eclipse-LazyStart: true
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-DocURL: http://www.apache.org/
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README (added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README Tue Sep  6 10:31:32
2011
@@ -0,0 +1,97 @@
+Calculator Sample
+=================
+This sample implements a simple calculator using SCA components. 
+
+The README in the samples directory (the directory above this) provides 
+general instructions about building and running samples. Take a look there 
+first. 
+
+If you just want to run it to see what happens open a command prompt, navigate
+to this sample directory and do:
+
+ant run
+
+OR if you don't have ant, on Windows do
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient
+
+and on *nix do
+
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
+
+Sample Overview
+---------------
+The sample provides a single calculator service with a default SCA (java) 
+binding. The CalculatorClient exercises this interface by calling add, 
+subtract, multiply and divide operations. This results in messages passing to 
+the appropriate components in the composite across the local wires.
+
+calculator/
+  src/
+    main/
+      java/
+        calculator/
+          CalculatorService.java  - the first component, calls +-/* as 
+                                    appropriate
+          CalculatorServiceImpl.java
+          AddService.java         - adds two numbers
+          AddServiceImpl.java
+          SubtractService.java    - subtracts one number from another
+          SubtractServiceImpl.java
+          MultiplyService.java    - multiplies two numbers
+          MultiplyServiceImpl.java
+          DivideService.java      - divides one number by another
+          DivideServiceImpl.java
+          CalculatorClient.java   - starts the SCA Runtime and 
+                                    deploys the Calculator.composite. 
+                                    It then calls the deployed Calculator 
+                                    Components services
+      resources/
+        Calculator.composite      - the SCA assembly for this sample
+    test/
+      java/
+        calculator/
+          CalculatorTestCase.java - JUnit test case 
+  calculator.png                  - a pictorial representation of the sample 
+                                    .composite file
+  build.xml                       - the Ant build file
+  pom.xml                         - the Maven build file        
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+With the binary distribution the sample can be built and run using Ant as 
+follows
+
+cd calculator
+ant compile
+ant run
+
+You should see the following output from the run target.
+
+run:
+     [java] 3 + 2=5.0
+     [java] 3 - 2=1.0
+     [java] 3 * 2=6.0
+     [java] 3 / 2=1.5
+
+Building And Running The Sample Using Maven 
+-------------------------------------------
+With either the binary or source distributions the sample can be built and run 
+using Maven as follows. 
+
+cd calculator
+mvn
+
+You should see the following output from the test phase.
+
+-------------------------------------------------------
+ T E S T S
+-------------------------------------------------------
+Running calculator.CalculatorTestCase
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
+
+Results :
+
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+This shows that the Junit test cases have run successfully. 

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README.odt
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README.odt?rev=1165595&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/README.odt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/pom.xml Tue Sep  6
10:31:32 2011
@@ -0,0 +1,95 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+         http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.tuscany.sca.samples</groupId>
+      <artifactId>tuscany-samples</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <relativePath />
+   </parent>
+   <artifactId>sample-contribution-osgi</artifactId>
+   <version>2.0-SNAPSHOT</version>
+
+   <name>Apache Tuscany SCA Calculator OSGi Sample</name>
+
+   <properties>
+      <tuscany.version>${project.version}</tuscany.version>
+   </properties>
+
+   <!-- ASF repositories so sample can be built from SVN without building trunk-->
+   <repositories><repository>
+       <id>apache.snapshots</id>
+       <name>Apache Snapshot Repository</name>
+       <url>http://repository.apache.org/snapshots</url>
+       <releases><enabled>false</enabled></releases>
+   </repository></repositories>
+   <pluginRepositories><pluginRepository>
+       <id>apache.snapshots</id>
+       <name>Apache Snapshot Repository</name>
+       <url>http://repository.apache.org/snapshots</url>
+       <releases><enabled>false</enabled></releases>
+   </pluginRepository></pluginRepositories>
+
+   <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>   
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</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>
+        <pluginManagement>
+            <plugins>
+               <plugin>
+                   <artifactId>maven-jar-plugin</artifactId>
+                   <configuration>
+                       <archive>
+                           <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile>
+                       </archive>
+                   </configuration>
+               </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/
------------------------------------------------------------------------------
    bugtraq:number = true

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddService.java
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,28 @@
+/*
+ * 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 Add service interface
+ */
+public interface AddService {
+
+    double add(double n1, double n2);
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/AddServiceImpl.java
Tue Sep  6 10:31:32 2011
@@ -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;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Add service
+ */
+public class AddServiceImpl implements AddService {
+
+    public double add(double n1, double n2) {
+        Logger logger = Logger.getLogger("calculator");
+        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
+        return n1 + n2;
+    }
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorActivator.java
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,47 @@
+/*
+ * 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 java.util.logging.Logger;
+
+import org.apache.tuscany.sca.Node;
+import org.apache.tuscany.sca.TuscanyRuntime;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * 
+ */
+public class CalculatorActivator implements BundleActivator {
+    private Logger logger = Logger.getLogger(CalculatorActivator.class.getName());
+
+    public void start(BundleContext context) throws Exception {
+        logger.info("Starting " + context.getBundle());
+        Node node = TuscanyRuntime.runComposite("Calculator.composite", context.getBundle().getLocation());
+        node.stop();
+    }
+
+    public void stop(BundleContext context) throws Exception {
+        logger.info("Stopping " + context.getBundle());
+        // Registered services will be automatically unregistered
+    }
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorClient.java
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,62 @@
+/*
+ * 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.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+
+/**
+ * This client program shows how to create an SCA runtime, start it,
+ * and locate and invoke a SCA component
+ */
+@Scope("COMPOSITE") @EagerInit
+public class CalculatorClient {
+    
+    private CalculatorService calculatorService;
+
+    @Reference
+    public void setCalculatorService(CalculatorService calculatorService) {
+        this.calculatorService = calculatorService;
+    }
+    
+    @Init
+    public void calculate() {
+
+        // Calculate
+        System.out.println("SCA API ClassLoader: " + print(Reference.class.getClassLoader()));
+        System.out.println("3 + 2=" + calculatorService.add(3, 2));
+        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
+        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
+        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
+    }
+    
+    private static String print(ClassLoader cl) {
+        StringBuffer buf = new StringBuffer();
+        for (; cl != null;) {
+            buf.append(cl.toString());
+            buf.append(' ');
+            cl = cl.getParent();
+        }
+        return buf.toString();
+    }
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorService.java
Tue Sep  6 10:31:32 2011
@@ -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/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/CalculatorServiceImpl.java
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,69 @@
+/*
+ * 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.Reference;
+
+/**
+ * An implementation of the Calculator service.
+ */
+public class CalculatorServiceImpl implements CalculatorService {
+
+    private AddService addService;
+    private SubtractService subtractService;
+    private MultiplyService multiplyService;
+    private DivideService divideService;
+
+    @Reference
+    public void setAddService(AddService addService) {
+        this.addService = addService;
+    }
+
+    @Reference
+    public void setSubtractService(SubtractService subtractService) {
+        this.subtractService = subtractService;
+    }
+
+    @Reference
+    public void setDivideService(DivideService divideService) {
+        this.divideService = divideService;
+    }
+
+    @Reference
+    public void setMultiplyService(MultiplyService multiplyService) {
+        this.multiplyService = multiplyService;
+    }
+
+    public double add(double n1, double n2) {
+        return addService.add(n1, n2);
+    }
+
+    public double subtract(double n1, double n2) {
+        return subtractService.subtract(n1, n2);
+    }
+
+    public double multiply(double n1, double n2) {
+        return multiplyService.multiply(n1, n2);
+    }
+
+    public double divide(double n1, double n2) {
+        return divideService.divide(n1, n2);
+    }
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideService.java
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,28 @@
+/*
+ * 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 divide service interface
+ */
+public interface DivideService {
+
+    double divide(double n1, double n2);
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/DivideServiceImpl.java
Tue Sep  6 10:31:32 2011
@@ -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;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Divide service.
+ */
+public class DivideServiceImpl implements DivideService {
+
+    public double divide(double n1, double n2) {
+        Logger logger = Logger.getLogger("calculator");
+        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
+        return n1 / n2;
+    }
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyService.java
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,28 @@
+/*
+ * 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 interface for the multiply service
+ */
+public interface MultiplyService {
+
+    double multiply(double n1, double n2);
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/MultiplyServiceImpl.java
Tue Sep  6 10:31:32 2011
@@ -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;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Multiply service.
+ */
+public class MultiplyServiceImpl implements MultiplyService {
+
+    public double multiply(double n1, double n2) {
+        Logger logger = Logger.getLogger("calculator");
+        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
+        return n1 * n2;
+    }
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractService.java
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,28 @@
+/*
+ * 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 interface for the multiply service
+ */
+public interface SubtractService {
+
+    double subtract(double n1, double n2);
+
+}

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/java/calculator/SubtractServiceImpl.java
Tue Sep  6 10:31:32 2011
@@ -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;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the subtract service.
+ */
+public class SubtractServiceImpl implements SubtractService {
+
+    public double subtract(double n1, double n2) {
+        Logger logger = Logger.getLogger("calculator");
+        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
+        return n1 - n2;
+    }
+
+}

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/resources/
------------------------------------------------------------------------------
    bugtraq:number = true

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/main/resources/Calculator.composite
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,56 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
+           targetNamespace="http://sample"
+           xmlns:sample="http://sample"
+           name="Calculator">
+           
+
+    <component name="CalculatorServiceComponent">
+        <implementation.java class="calculator.CalculatorServiceImpl"/>
+        <reference name="addService" target="AddServiceComponent" />
+        <reference name="subtractService" target="SubtractServiceComponent" />
+        <reference name="multiplyService" target="MultiplyServiceComponent" />
+        <reference name="divideService" target="DivideServiceComponent" />
+    </component>
+
+    <component name="AddServiceComponent">
+        <implementation.java class="calculator.AddServiceImpl"/>
+    </component>
+
+    <component name="SubtractServiceComponent">
+        <implementation.java class="calculator.SubtractServiceImpl"/>
+    </component>
+
+    <component name="MultiplyServiceComponent">
+        <implementation.java class="calculator.MultiplyServiceImpl"/>
+    </component>
+
+    <component name="DivideServiceComponent">
+        <implementation.java class="calculator.DivideServiceImpl"/>
+    </component>
+    
+    
+    <component name="CalculatorClient">
+        <implementation.java class="calculator.CalculatorClient"/>
+        <reference name="calculatorService" target="CalculatorServiceComponent" />
+    </component>    
+
+</composite>

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/calculator/
------------------------------------------------------------------------------
    bugtraq:number = true

Added: tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java?rev=1165595&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java
(added)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/contribution-osgi/src/test/java/calculator/CalculatorTestCase.java
Tue Sep  6 10:31:32 2011
@@ -0,0 +1,49 @@
+/*
+ * 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.junit.Assert;
+
+import org.apache.tuscany.sca.Node;
+import org.apache.tuscany.sca.TuscanyRuntime;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchServiceException;
+
+/*
+ * A unit test for the Calculator composite that just fires up the
+ * composite and expects the EagerInit of the CalculatorClient component
+ * to do its thing
+ */
+public class CalculatorTestCase {
+
+    @Test
+    public void testCalculate() throws NoSuchServiceException {
+
+        // Run the SCA composite in a Tuscany runtime
+        Node node = TuscanyRuntime.runComposite("Calculator.composite", "target/classes");
+        try {
+            
+
+            
+        } finally {
+            // Stop the Tuscany runtime Node
+            node.stop();        
+        }
+    }
+}

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml?rev=1165595&r1=1165594&r2=1165595&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/pom.xml Tue Sep  6 10:31:32 2011
@@ -40,6 +40,9 @@
             <modules>
                 <module>binding-comet</module>
                 <module>binding-websocket</module>
+<!--
+                <module>contribution-osgi</module>
+-->
             </modules>
         </profile>
     </profiles>    

Propchange: tuscany/sca-java-2.x/trunk/samples/running-tuscany/osgi/
------------------------------------------------------------------------------
    bugtraq:number = true

Added: tuscany/sca-java-2.x/trunk/samples/running-tuscany/osgi/README.odt
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/osgi/README.odt?rev=1165595&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tuscany/sca-java-2.x/trunk/samples/running-tuscany/osgi/README.odt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message