Moved calculator-android sample to the samples directory.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695028 13f79535-47bb-0310-9956-ffa450edef68

51 files changed, 0 insertions, 146 deletions

diff --git a/branches/sca-android/modules/calculator-android/.classpath b/branches/sca-android/modules/calculator-android/.classpath
deleted file mode 100644
index 6f78dd6f3c..0000000000
--- a/branches/sca-android/modules/calculator-android/.classpath
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.project.AndroidClasspathContainerInitializer"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-assembly"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-assembly-java-dsl"/>

-	<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-binding-atom"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-atom-abdera"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-dwr"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-ejb"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-feed"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-http"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-jms"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-jsonrpc"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-notification"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-rmi"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-rss"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-rss-rome"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-sca"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-sca-axis2"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-sca-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-ws"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-ws-axis2"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-binding-ws-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution-groovy"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution-java"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution-namespace"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution-osgi"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution-resource"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-core"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-core-databinding"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-core-spi"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-core-spring"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-axiom"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-fastinfoset"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-jaxb"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-json"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-saxon"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-sdo"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-sdo-axiom"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-xmlbeans"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-databinding-xstream"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-data-engine-helper"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-definitions"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-definitions-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-domain"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-domain-api"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-domain-impl"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-extensibility"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-extension-helper"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-host-embedded"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-host-http"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-host-jetty"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-host-rmi"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-host-tomcat"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-host-webapp"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-host-webapp-junit"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-bpel"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-das"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-data-api"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-data-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-ejb"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-ejb-xml"/>

-	<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-implementation-node"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-node-runtime"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-node-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-notification"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-osgi"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-resource"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-script"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-spring"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-widget"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-implementation-xquery"/>

-	<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-jaxws"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-interface-java-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-interface-wsdl"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-interface-wsdl-java2wsdl"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-interface-wsdl-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-node"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-node2-api"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-node2-impl"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-node2-launcher"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-node2-launcher-webapp"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-node-api"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-node-impl"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-osgi-runtime"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-policy"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-policy-logging"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-policy-security"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-policy-transaction"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-policy-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-runtime"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-runtime-tomcat"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-runtime-war"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-sca-api"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-workspace"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-workspace-admin"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-workspace-impl"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-workspace-xml"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-contribution-impl"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/android-jdk-classes"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/branches/sca-android/modules/calculator-android/.project b/branches/sca-android/modules/calculator-android/.project
deleted file mode 100644
index e77a01d623..0000000000
--- a/branches/sca-android/modules/calculator-android/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>calculator-android</name>

-	<comment></comment>

-	<projects>

-	</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-android/modules/calculator-android/AndroidManifest.xml b/branches/sca-android/samples/calculator-android/AndroidManifest.xml
index 8f419508ce..8f419508ce 100644
--- a/branches/sca-android/modules/calculator-android/AndroidManifest.xml
+++ b/branches/sca-android/samples/calculator-android/AndroidManifest.xml
diff --git a/branches/sca-android/modules/calculator-android/res/drawable/icon.png b/branches/sca-android/samples/calculator-android/res/drawable/icon.png
index 64e3601c23..64e3601c23 100644
--- a/branches/sca-android/modules/calculator-android/res/drawable/icon.png
+++ b/branches/sca-android/samples/calculator-android/res/drawable/icon.png
diff --git a/branches/sca-android/modules/calculator-android/res/layout/main.xml b/branches/sca-android/samples/calculator-android/res/layout/main.xml
index 469c950462..469c950462 100644
--- a/branches/sca-android/modules/calculator-android/res/layout/main.xml
+++ b/branches/sca-android/samples/calculator-android/res/layout/main.xml
diff --git a/branches/sca-android/modules/calculator-android/res/raw/calculator_composite b/branches/sca-android/samples/calculator-android/res/raw/calculator_composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/calculator_composite
+++ b/branches/sca-android/samples/calculator-android/res/raw/calculator_composite
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca.xsd
index e108342693..e108342693 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_all.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_all.xsd
index 6e3b848a53..6e3b848a53 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_all.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_all.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_ejb.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_binding_ejb.xsd
index 0e7e40432c..0e7e40432c 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_ejb.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_binding_ejb.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_jms.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_binding_jms.xsd
index 868a9d64e0..868a9d64e0 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_jms.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_binding_jms.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_sca.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_binding_sca.xsd
index 8005cda8a6..8005cda8a6 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_sca.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_binding_sca.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_webservice.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_binding_webservice.xsd
index 92446c0338..92446c0338 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_webservice.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_binding_webservice.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_core.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_core.xsd
index 20e0a6901c..20e0a6901c 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_core.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_core.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_definitions.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_definitions.xsd
index 4676d34eeb..4676d34eeb 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_definitions.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_definitions.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_bpel.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_bpel.xsd
index 80141a57af..80141a57af 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_bpel.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_bpel.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_composite_xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_composite_xsd
index 2486653235..2486653235 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_composite_xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_composite_xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_cpp.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_cpp.xsd
index 1d157d9504..1d157d9504 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_cpp.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_cpp.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_ejb.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_ejb.xsd
index 850b854fd5..850b854fd5 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_ejb.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_ejb.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_java.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_java.xsd
index 792ad407b3..792ad407b3 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_java.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_java.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_spring.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_spring.xsd
index a9ef307bed..a9ef307bed 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_spring.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_implementation_spring.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_cpp.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_interface_cpp.xsd
index 9cae7e3685..9cae7e3685 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_cpp.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_interface_cpp.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_java.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_interface_java.xsd
index 3f9eb25440..3f9eb25440 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_java.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_interface_java.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_wsdl.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_interface_wsdl.xsd
index c161d98f88..c161d98f88 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_wsdl.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_interface_wsdl.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_policy.xsd b/branches/sca-android/samples/calculator-android/res/raw/sca_policy.xsd
index 1ae1c9dfdc..1ae1c9dfdc 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_policy.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/sca_policy.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca.xsd
index 33b7c5099b..33b7c5099b 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_atom.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_atom.xsd
index 1423a7ee87..1423a7ee87 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_atom.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_atom.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_dwr.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_dwr.xsd
index 98b17bbb8b..98b17bbb8b 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_dwr.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_dwr.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_http.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_http.xsd
index 4d709353d0..4d709353d0 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_http.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_http.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_jsonrpc.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_jsonrpc.xsd
index e03d6feb02..e03d6feb02 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_jsonrpc.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_jsonrpc.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_notification.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_notification.xsd
index d1b23e8826..d1b23e8826 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_notification.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_notification.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rmi.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_rmi.xsd
index 7815e390e4..7815e390e4 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rmi.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_rmi.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rss.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_rss.xsd
index 8fd10cc781..8fd10cc781 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rss.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_binding_rss.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_node.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_node.xsd
index 1943c98d70..1943c98d70 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_node.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_node.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_notification.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_notification.xsd
index 1c4c6d7aeb..1c4c6d7aeb 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_notification.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_notification.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_osgi.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_osgi.xsd
index 9fedc2bb84..9fedc2bb84 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_osgi.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_osgi.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_resource.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_resource.xsd
index e37b2c47ee..e37b2c47ee 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_resource.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_resource.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_script.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_script.xsd
index a13643d148..a13643d148 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_script.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_script.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_widget.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_widget.xsd
index 1afb30c106..1afb30c106 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_widget.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_widget.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_xquery.xsd b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_xquery.xsd
index 875f0da1dc..875f0da1dc 100644
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_xquery.xsd
+++ b/branches/sca-android/samples/calculator-android/res/raw/tuscany_sca_implementation_xquery.xsd
diff --git a/branches/sca-android/modules/calculator-android/res/values/strings.xml b/branches/sca-android/samples/calculator-android/res/values/strings.xml
index 91b584c887..91b584c887 100644
--- a/branches/sca-android/modules/calculator-android/res/values/strings.xml
+++ b/branches/sca-android/samples/calculator-android/res/values/strings.xml
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/AddService.java b/branches/sca-android/samples/calculator-android/src/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/AddService.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/AddService.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/AddServiceImpl.java b/branches/sca-android/samples/calculator-android/src/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/AddServiceImpl.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/CalculatorService.java b/branches/sca-android/samples/calculator-android/src/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/CalculatorService.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/CalculatorService.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/CalculatorServiceImpl.java b/branches/sca-android/samples/calculator-android/src/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/CalculatorServiceImpl.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/DivideService.java b/branches/sca-android/samples/calculator-android/src/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/DivideService.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/DivideService.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/DivideServiceImpl.java b/branches/sca-android/samples/calculator-android/src/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/DivideServiceImpl.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/MultiplyService.java b/branches/sca-android/samples/calculator-android/src/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/MultiplyService.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/MultiplyService.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/MultiplyServiceImpl.java b/branches/sca-android/samples/calculator-android/src/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/MultiplyServiceImpl.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/SubtractService.java b/branches/sca-android/samples/calculator-android/src/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/SubtractService.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/SubtractService.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/SubtractServiceImpl.java b/branches/sca-android/samples/calculator-android/src/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/SubtractServiceImpl.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/modules/calculator-android/src/calculator/android/CalculatorClient.java b/branches/sca-android/samples/calculator-android/src/calculator/android/CalculatorClient.java
index 7d6a6613ed..7d6a6613ed 100644
--- a/branches/sca-android/modules/calculator-android/src/calculator/android/CalculatorClient.java
+++ b/branches/sca-android/samples/calculator-android/src/calculator/android/CalculatorClient.java