You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/12/17 20:51:25 UTC

svn commit: r727494 - in /tuscany/branches/sca-java-1.x/samples/calculator-android: ./ .settings/ META-INF/ res/ res/drawable/ res/layout/ res/values/ src/ src/calculator/ src/calculator/android/

Author: lresende
Date: Wed Dec 17 11:51:24 2008
New Revision: 727494

URL: http://svn.apache.org/viewvc?rev=727494&view=rev
Log:
[Work in progress] An Android version of the calculator sample application

Added:
    tuscany/branches/sca-java-1.x/samples/calculator-android/
    tuscany/branches/sca-java-1.x/samples/calculator-android/.classpath
    tuscany/branches/sca-java-1.x/samples/calculator-android/.project
    tuscany/branches/sca-java-1.x/samples/calculator-android/.settings/
    tuscany/branches/sca-java-1.x/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs
    tuscany/branches/sca-java-1.x/samples/calculator-android/AndroidManifest.xml
    tuscany/branches/sca-java-1.x/samples/calculator-android/META-INF/
    tuscany/branches/sca-java-1.x/samples/calculator-android/META-INF/MANIFEST.MF
    tuscany/branches/sca-java-1.x/samples/calculator-android/res/
    tuscany/branches/sca-java-1.x/samples/calculator-android/res/drawable/
    tuscany/branches/sca-java-1.x/samples/calculator-android/res/drawable/icon.png
    tuscany/branches/sca-java-1.x/samples/calculator-android/res/layout/
    tuscany/branches/sca-java-1.x/samples/calculator-android/res/layout/main.xml
    tuscany/branches/sca-java-1.x/samples/calculator-android/res/values/
    tuscany/branches/sca-java-1.x/samples/calculator-android/res/values/strings.xml
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorBuilder.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.java
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$attr.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$drawable.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$layout.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$string.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.class
    tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.java

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/.classpath
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/.classpath?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/.classpath (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/.classpath Wed Dec 17 11:51:24 2008
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-assembly"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-assembly-xml"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-assembly-xsd"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-definitions"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-definitions-xml"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-extensibility"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-java"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-java-runtime"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-java-xml"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-interface"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-interface-java"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-interface-java-xml"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-monitor"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-policy"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-sca-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution-impl"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-host-android"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/.project
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/.project?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/.project (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/.project Wed Dec 17 11:51:24 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>calculator-android</name>
+	<comment></comment>
+	<projects>
+		<project>tuscany-assembly</project>
+		<project>tuscany-definitions</project>
+		<project>tuscany-extensibility</project>
+		<project>tuscany-interface</project>
+		<project>tuscany-monitor</project>
+		<project>tuscany-policy</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs Wed Dec 17 11:51:24 2008
@@ -0,0 +1,5 @@
+#Mon Nov 24 19:53:10 PST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/AndroidManifest.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/AndroidManifest.xml?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/AndroidManifest.xml (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/AndroidManifest.xml Wed Dec 17 11:51:24 2008
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="calculator.android"
+      android:versionCode="1"
+      android:versionName="1.0.0">
+    <application android:icon="@drawable/icon" android:label="@string/app_name">
+        <activity android:name=".CalculatorClient"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/META-INF/MANIFEST.MF?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/META-INF/MANIFEST.MF (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/META-INF/MANIFEST.MF Wed Dec 17 11:51:24 2008
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/res/drawable/icon.png
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/res/drawable/icon.png?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/res/drawable/icon.png (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/res/drawable/icon.png Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/res/layout/main.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/res/layout/main.xml?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/res/layout/main.xml (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/res/layout/main.xml Wed Dec 17 11:51:24 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/res/values/strings.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/res/values/strings.xml?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/res/values/strings.xml (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/res/values/strings.xml Wed Dec 17 11:51:24 2008
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World, CalculatorClient</string>
+    <string name="app_name">Calculator</string>
+</resources>

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddService.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,11 @@
+package calculator;
+
+
+/**
+ * The Add service interface
+ */
+public interface AddService {
+
+    double add(double n1, double n2);
+
+}

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/AddServiceImpl.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,18 @@
+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/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorBuilder.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorBuilder.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorBuilder.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorBuilder.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorClient.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,30 @@
+package calculator;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+
+
+/**
+ * This client program shows how to create an SCA runtime, start it,
+ * and locate and invoke a SCA component
+ */
+public class CalculatorClient {
+    public static void main(String[] args) throws Exception {
+
+        
+        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
+        
+        CalculatorService calculatorService = 
+            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+
+        // Calculate
+        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));
+
+        scaDomain.close();
+        
+    }
+
+}

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorService.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,18 @@
+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/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/CalculatorServiceImpl.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,54 @@
+package calculator;
+
+
+//import org.osoa.sca.annotations.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/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideService.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,11 @@
+package calculator;
+
+
+/**
+ * The divide service interface
+ */
+public interface DivideService {
+
+    double divide(double n1, double n2);
+
+}

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/DivideServiceImpl.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,18 @@
+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/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyService.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,11 @@
+package calculator;
+
+
+/**
+ * The interface for the multiply service
+ */
+public interface MultiplyService {
+
+    double multiply(double n1, double n2);
+
+}

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/MultiplyServiceImpl.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,18 @@
+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/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractService.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,11 @@
+package calculator;
+
+
+/**
+ * The interface for the multiply service
+ */
+public interface SubtractService {
+
+    double subtract(double n1, double n2);
+
+}

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/SubtractServiceImpl.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,18 @@
+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;
+    }
+
+}

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/CalculatorClient.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,77 @@
+package calculator.android;
+
+import java.net.URL;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+import calculator.CalculatorService;
+
+public class CalculatorClient extends Activity {
+	private EmbeddedSCADomain domain;
+	private CalculatorService calculatorService;
+
+	/** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        String calculationResult = "Error !";
+        try {
+        	
+        	SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
+            
+            CalculatorService calculatorService = 
+                scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+
+            // Calculate
+            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));
+
+            scaDomain.close();
+
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        
+        
+        
+        TextView tv = new TextView(this);
+        tv.setText("3 + 2 =" + calculationResult);
+        setContentView(tv);
+        
+    }
+    
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		
+		try {
+			//scaDomain.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+ 
+    @Override
+	public void onContentChanged() {
+		super.onContentChanged();
+		/*
+        // Calculate
+        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));
+        */
+
+	}
+	
+	
+}
\ No newline at end of file

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$attr.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R%24attr.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$attr.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$attr.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$drawable.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R%24drawable.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$drawable.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$drawable.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$layout.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R%24layout.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$layout.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$layout.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$string.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R%24string.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$string.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R$string.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.class
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.class?rev=727494&view=auto
==============================================================================
Files tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.class (added) and tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.class Wed Dec 17 11:51:24 2008 differ

Added: tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.java?rev=727494&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.java (added)
+++ tuscany/branches/sca-java-1.x/samples/calculator-android/src/calculator/android/R.java Wed Dec 17 11:51:24 2008
@@ -0,0 +1,23 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package calculator.android;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}