summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/samples/calculator-android
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/.classpath26
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/.project39
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs5
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/AndroidManifest.xml15
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/META-INF/MANIFEST.MF2
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/res/drawable/icon.pngbin3180 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/res/layout/main.xml12
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/res/values/strings.xml5
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/AddService.classbin134 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/AddService.java11
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/AddServiceImpl.classbin1019 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/AddServiceImpl.java18
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorBuilder.classbin2314 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorClient.classbin461 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorClient.java30
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorService.classbin203 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorService.java18
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorServiceImpl.classbin1682 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorServiceImpl.java54
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideService.classbin143 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideService.java11
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideServiceImpl.classbin1037 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideServiceImpl.java18
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyService.classbin149 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyService.java11
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyServiceImpl.classbin1050 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyServiceImpl.java18
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractService.classbin149 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractService.java11
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractServiceImpl.classbin1050 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractServiceImpl.java18
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/android/CalculatorClient.classbin920 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/android/CalculatorClient.java233
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$attr.classbin340 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$drawable.classbin400 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$layout.classbin394 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$string.classbin427 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R.classbin489 -> 0 bytes
-rw-r--r--branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R.java23
39 files changed, 0 insertions, 578 deletions
diff --git a/branches/sca-java-1.5/samples/calculator-android/.classpath b/branches/sca-java-1.5/samples/calculator-android/.classpath
deleted file mode 100644
index 73c77ee74d..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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-embedded"/>
- <classpathentry kind="lib" path="/home/acc/.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
- <classpathentry kind="lib" path="/home/acc/.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/branches/sca-java-1.5/samples/calculator-android/.project b/branches/sca-java-1.5/samples/calculator-android/.project
deleted file mode 100644
index b0a16117c8..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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>
diff --git a/branches/sca-java-1.5/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs b/branches/sca-java-1.5/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4077c7b7f0..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#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
diff --git a/branches/sca-java-1.5/samples/calculator-android/AndroidManifest.xml b/branches/sca-java-1.5/samples/calculator-android/AndroidManifest.xml
deleted file mode 100644
index ad6daf347e..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
diff --git a/branches/sca-java-1.5/samples/calculator-android/META-INF/MANIFEST.MF b/branches/sca-java-1.5/samples/calculator-android/META-INF/MANIFEST.MF
deleted file mode 100644
index 58630c02ef..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/branches/sca-java-1.5/samples/calculator-android/res/drawable/icon.png b/branches/sca-java-1.5/samples/calculator-android/res/drawable/icon.png
deleted file mode 100644
index 75024841d3..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/res/drawable/icon.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/res/layout/main.xml b/branches/sca-java-1.5/samples/calculator-android/res/layout/main.xml
deleted file mode 100644
index 3a5f117d3c..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
diff --git a/branches/sca-java-1.5/samples/calculator-android/res/values/strings.xml b/branches/sca-java-1.5/samples/calculator-android/res/values/strings.xml
deleted file mode 100644
index 71052e74b8..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="hello">Hello World, CalculatorClient</string>
- <string name="app_name">Calculator</string>
-</resources>
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddService.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddService.class
deleted file mode 100644
index 8a5ed25f9f..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddService.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddService.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddService.java
deleted file mode 100644
index 21c6789632..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package calculator;
-
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddServiceImpl.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddServiceImpl.class
deleted file mode 100644
index c6fd83f6a1..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddServiceImpl.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddServiceImpl.java
deleted file mode 100644
index 6181a1c651..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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;
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorBuilder.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorBuilder.class
deleted file mode 100644
index b4466a3017..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorBuilder.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorClient.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorClient.class
deleted file mode 100644
index aaf9e9710f..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorClient.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorClient.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorClient.java
deleted file mode 100644
index 3b977259e8..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,30 +0,0 @@
-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();
-
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorService.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorService.class
deleted file mode 100644
index c3cc2911e9..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorService.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorService.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorService.java
deleted file mode 100644
index 862d7b892d..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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);
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorServiceImpl.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorServiceImpl.class
deleted file mode 100644
index 8e0f206119..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 2c88b5319e..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-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);
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideService.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideService.class
deleted file mode 100644
index 8f056b16b6..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideService.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideService.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideService.java
deleted file mode 100644
index 8f544632dc..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package calculator;
-
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideServiceImpl.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideServiceImpl.class
deleted file mode 100644
index 09cae06d9c..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideServiceImpl.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideServiceImpl.java
deleted file mode 100644
index 5dfae77222..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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;
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyService.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyService.class
deleted file mode 100644
index 6542db7083..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyService.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyService.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyService.java
deleted file mode 100644
index f7f4ee77b5..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package calculator;
-
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyServiceImpl.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyServiceImpl.class
deleted file mode 100644
index 0e69e7ad2d..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 3142f86a58..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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;
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractService.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractService.class
deleted file mode 100644
index 84c741e301..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractService.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractService.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractService.java
deleted file mode 100644
index 2349febb0f..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package calculator;
-
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractServiceImpl.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractServiceImpl.class
deleted file mode 100644
index 7b1aeab811..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractServiceImpl.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractServiceImpl.java
deleted file mode 100644
index ec55f4f07d..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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;
- }
-
-}
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/CalculatorClient.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/CalculatorClient.class
deleted file mode 100644
index 20b588f972..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/CalculatorClient.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/CalculatorClient.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/CalculatorClient.java
deleted file mode 100644
index 9e5c782447..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/CalculatorClient.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package calculator.android;
-
-import java.io.FileDescriptor;
-import java.net.InetAddress;
-import java.net.URL;
-import java.security.Permission;
-
-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 {
- System.setSecurityManager(new SecurityManager() {
- @Override
- public void checkPermission(Permission permission) {
-
- }
-
- @Override
- public void checkAccept(String host, int port) {
-
- }
-
- @Override
- public void checkAccess(Thread thread) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkAccess(ThreadGroup group) {
-
- }
-
- @Override
- public void checkAwtEventQueueAccess() {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkConnect(String host, int port) {
-
- }
- @Override
- public void checkConnect(String host, int port, Object context) {
-
- }
- @Override
- public void checkCreateClassLoader() {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkDelete(String file) {
-
- }
- @Override
- public void checkExec(String cmd) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkExit(int status) {
-
- }
- @Override
- public void checkLink(String libName) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkListen(int port) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkMemberAccess(Class<?> cls, int type) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkMulticast(InetAddress maddr) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkMulticast(InetAddress maddr, byte ttl) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkPackageAccess(String packageName) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkPackageDefinition(String packageName) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkPermission(Permission permission,
- Object context) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkPrintJobAccess() {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkPropertiesAccess() {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkPropertyAccess(String key) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkRead(FileDescriptor fd) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkRead(String file) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkRead(String file, Object context) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkSecurityAccess(String target) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkSetFactory() {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkSystemClipboardAccess() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void checkWrite(FileDescriptor fd) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void checkWrite(String file) {
- // TODO Auto-generated method stub
-
- }
-
- });
-
- Thread.currentThread().setContextClassLoader(getClassLoader());
-
- 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
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$attr.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$attr.class
deleted file mode 100644
index 4d7e121ddc..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$attr.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$drawable.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$drawable.class
deleted file mode 100644
index 842aa47958..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$drawable.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$layout.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$layout.class
deleted file mode 100644
index 2b7eadeac8..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$layout.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$string.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$string.class
deleted file mode 100644
index fd104e6c86..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R$string.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R.class b/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R.class
deleted file mode 100644
index 7bca04a8a4..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R.class
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R.java b/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R.java
deleted file mode 100644
index a338c98c3a..0000000000
--- a/branches/sca-java-1.5/samples/calculator-android/src/calculator/android/R.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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;
- }
-}