547 files changed, 0 insertions, 1460 deletions

diff --git a/branches/sca-android/modules/core-android/DISCLAIMER b/branches/sca-android/modules/assembly-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/core-android/DISCLAIMER
+++ b/branches/sca-android/modules/assembly-xml/DISCLAIMER
diff --git a/branches/sca-android/modules/core-android/LICENSE b/branches/sca-android/modules/assembly-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/core-android/LICENSE
+++ b/branches/sca-android/modules/assembly-xml/LICENSE
diff --git a/branches/sca-android/modules/core-android/NOTICE b/branches/sca-android/modules/assembly-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/core-android/NOTICE
+++ b/branches/sca-android/modules/assembly-xml/NOTICE
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/pom.xml b/branches/sca-android/modules/assembly-xml/pom.xml
index 1580311fff..1580311fff 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/pom.xml
+++ b/branches/sca-android/modules/assembly-xml/pom.xml
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index b94d9e0927..b94d9e0927 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 2950ef5a04..2950ef5a04 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 241e18badf..241e18badf 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 760e202ed2..760e202ed2 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index 2f3f66e14f..2f3f66e14f 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index e939fe2c05..e939fe2c05 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index c74c5bfb5b..c74c5bfb5b 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index 43e0242b7e..43e0242b7e 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 3f471838fc..3f471838fc 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 8e441f14d3..8e441f14d3 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index 8ba293d755..8ba293d755 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index a4200a3881..a4200a3881 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index c862a6f127..c862a6f127 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index 7fd642221b..7fd642221b 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index 360cfbbacc..360cfbbacc 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
index 2ee4abd99a..2ee4abd99a 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index ffd88cc4a4..ffd88cc4a4 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 4fe068142d..4fe068142d 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 5ead95df9d..5ead95df9d 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index 6db364950a..6db364950a 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index 6f0ef3ad96..6f0ef3ad96 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
index 5b9292cb17..5b9292cb17 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index b28a01e156..b28a01e156 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index acbd44dbc9..acbd44dbc9 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 8512dcefa1..8512dcefa1 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index aa95b98a31..aa95b98a31 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 4546fddb2d..4546fddb2d 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 2dbecdabb7..2dbecdabb7 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 2da2b56e8e..2da2b56e8e 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 0e7a48c698..0e7a48c698 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 7bc7ccdb83..7bc7ccdb83 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bcc8c54dc8..bcc8c54dc8 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index b79cb6b7b7..b79cb6b7b7 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/branches/sca-android/modules/host-android/DISCLAIMER b/branches/sca-android/modules/assembly/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/host-android/DISCLAIMER
+++ b/branches/sca-android/modules/assembly/DISCLAIMER
diff --git a/branches/sca-android/modules/host-android/LICENSE b/branches/sca-android/modules/assembly/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/host-android/LICENSE
+++ b/branches/sca-android/modules/assembly/LICENSE
diff --git a/branches/sca-android/modules/host-android/NOTICE b/branches/sca-android/modules/assembly/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/host-android/NOTICE
+++ b/branches/sca-android/modules/assembly/NOTICE
diff --git a/branches/sca-android/modules/tuscany-assembly/pom.xml b/branches/sca-android/modules/assembly/pom.xml
index b34e5d21a1..b34e5d21a1 100644
--- a/branches/sca-android/modules/tuscany-assembly/pom.xml
+++ b/branches/sca-android/modules/assembly/pom.xml
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index a234083bef..a234083bef 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 514106208d..514106208d 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index 9cdb51dad0..9cdb51dad0 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 13e69cef36..13e69cef36 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 04f0dd8b47..04f0dd8b47 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index dba3e9f1ae..dba3e9f1ae 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 028a10c995..028a10c995 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index c8a36cc555..c8a36cc555 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 132569ded3..132569ded3 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 998540612b..998540612b 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index 5ce75aa7b4..5ce75aa7b4 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 74110329f5..74110329f5 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index c4ad4fa0cb..c4ad4fa0cb 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index bd8f97910e..bd8f97910e 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index 8b55127870..8b55127870 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 2f7b2d0da4..2f7b2d0da4 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index a412bcee24..a412bcee24 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 1bd27d07b3..1bd27d07b3 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index a717715554..a717715554 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 1205c4ce6c..1205c4ce6c 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index ce998c0662..ce998c0662 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index ad47c4c5aa..ad47c4c5aa 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index a93c3c5ee3..a93c3c5ee3 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 2ca8589b1a..2ca8589b1a 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 1eb2188568..1eb2188568 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 8828e36970..8828e36970 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 874164e78a..874164e78a 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index ece8eeb028..ece8eeb028 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 881d7df5e4..881d7df5e4 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index c63bee0303..c63bee0303 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index bd457b3c34..bd457b3c34 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index e0ac9ada03..e0ac9ada03 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 050a7e5cb5..050a7e5cb5 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index c2c91f715e..c2c91f715e 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
index 5630d19366..5630d19366 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 88468938fd..88468938fd 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
index 70ec19288a..70ec19288a 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
index ec25c8e2a7..ec25c8e2a7 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
index 791d131871..791d131871 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index caa212ccdf..caa212ccdf 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index 142bed9d63..142bed9d63 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
index 9040b8bd99..9040b8bd99 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index cda3c5b91a..cda3c5b91a 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
index c7a4990230..c7a4990230 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
index b2f96c30cc..b2f96c30cc 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
index 2bd010c489..2bd010c489 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
index ae9ed87035..ae9ed87035 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
index 0e290865bd..0e290865bd 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index e50d65f1d3..e50d65f1d3 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index 32a39fbb5f..32a39fbb5f 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
index 396cf011aa..396cf011aa 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
index d2eeb51ee7..d2eeb51ee7 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 75cb91189b..75cb91189b 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index 16dc8394ce..16dc8394ce 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index ba58b50748..ba58b50748 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 9214df05a9..9214df05a9 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index f51162598b..f51162598b 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index c8af31eee8..c8af31eee8 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index e30ff1e725..e30ff1e725 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e5aa4e2db7..e5aa4e2db7 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 799e1c2e23..799e1c2e23 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 7432b655e9..7432b655e9 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index a292857cd2..a292857cd2 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 26829aa172..26829aa172 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 5d9c00ea82..5d9c00ea82 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index ad91c5ffa4..ad91c5ffa4 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 3bc3dfc6af..3bc3dfc6af 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index 5cf062821a..5cf062821a 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 874efe45da..874efe45da 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 38b6cd7ce3..38b6cd7ce3 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 81bed59e1a..81bed59e1a 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 73604736a5..73604736a5 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 186e98cd5e..186e98cd5e 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index b01bd42a96..b01bd42a96 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 2c8f426f82..2c8f426f82 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 2c8bf309df..2c8bf309df 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index a6b594f311..a6b594f311 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 698623ee1a..698623ee1a 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index 8e82efd04b..8e82efd04b 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index e020bdbc9a..e020bdbc9a 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index 996eb40b75..996eb40b75 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
index 609e1733aa..609e1733aa 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index bef6b47ee7..bef6b47ee7 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index b87ffc5905..b87ffc5905 100644
--- a/branches/sca-android/modules/tuscany-assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
diff --git a/branches/sca-android/modules/core-android/.classpath b/branches/sca-android/modules/core-android/.classpath
deleted file mode 100644
index a25189936b..0000000000
--- a/branches/sca-android/modules/core-android/.classpath
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>

-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>

-	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>

-	<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>

-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-commonj_1.1_spec/1.0/geronimo-commonj_1.1_spec-1.0.jar"/>

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

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

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

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

-	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>

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

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

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

-	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar"/>

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

-	<classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android"/>

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

-	<classpathentry kind="output" path="target/classes"/>

-</classpath>

diff --git a/branches/sca-android/modules/core-android/.project b/branches/sca-android/modules/core-android/.project
deleted file mode 100644
index 1678b1e753..0000000000
--- a/branches/sca-android/modules/core-android/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<projectDescription>
-  <name>tuscany-core</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-contribution</project>
-    <project>tuscany-assembly</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-interface</project>
-    <project>tuscany-contribution-java</project>
-    <project>tuscany-core-spi</project>
-    <project>tuscany-sca-api</project>
-    <project>tuscany-interface-java</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
deleted file mode 100644
index 982b2a0492..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.core.work;

-

-/*

- * JCA work wrapper.

- */

-public class Jsr237Work<T extends Runnable> implements commonj.work.Work {

-

-    // Work that is being executed.

-    private T work;

-

-    /*

-     * Initializes the work instance.

-     */

-    public Jsr237Work(T work) {

-        this.work = work;

-    }

-

-    /*

-     * Returns the completed work.

-     */

-    public T getWork() {

-        return work;

-    }

-

-    /*

-     * Release the work.

-     */

-    public void release() {

-    }

-

-    /*

-     * Work attributes are not daemon.

-     */

-    public boolean isDaemon() {

-        return false;

-    }

-

-    /*

-     * Runs the work.

-     */

-    public void run() {

-        work.run();

-    }

-}
\ No newline at end of file
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
deleted file mode 100644
index ec47d8ac07..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.core.work;

-

-/*import javax.naming.InitialContext;

-import javax.naming.NamingException;*/

-

-import org.apache.tuscany.sca.work.NotificationListener;

-import org.apache.tuscany.sca.work.WorkScheduler;

-import org.apache.tuscany.sca.work.WorkSchedulerException;

-

-import commonj.work.WorkEvent;

-import commonj.work.WorkListener;

-import commonj.work.WorkManager;

-

-/**

- * A work scheduler implementation based on a JSR 237 work manager.

- * <p/>

- * <p/>

- * This needs a JSR 237 work manager implementation available for scheduling work. Instances can be configured with a

- * work manager implementation that is injected in. It is the responsibility of the runtime environment to make a work

- * manager implementation available. For example, if the managed environment supports work manager the runtime can use

- * the appropriate lookup mechanism to inject the work manager implementation. </p>

- */

-public class Jsr237WorkScheduler implements WorkScheduler {

-

-    /**

-     * Underlying JSR-237 work manager

-     */

-    private WorkManager jsr237WorkManager;

-

-    /**

-     * Initializes the JSR 237 work manager.

-     *

-     * @param jsr237WorkManager JSR 237 work manager.

-     */

-    public Jsr237WorkScheduler() {

-        

-    	/*

-    	try {

-            InitialContext ctx  = new InitialContext();

-            jsr237WorkManager = (WorkManager) ctx.lookup("java:comp/env/wm/TuscanyWorkManager");

-        } catch (NamingException e) {

-            // ignore

-        }*/

-        

-        if (jsr237WorkManager == null) {

-            jsr237WorkManager = new ThreadPoolWorkManager(10);

-        }

-    }

-

-    /**

-     * Schedules a unit of work for future execution. The notification listener is used to register interest in

-     * callbacks regarding the status of the work.

-     *

-     * @param work The unit of work that needs to be asynchronously executed.

-     */

-    public <T extends Runnable> void scheduleWork(T work) {

-        scheduleWork(work, null);

-    }

-

-    /**

-     * Schedules a unit of work for future execution. The notification listener is used to register interest in

-     * callbacks regarding the status of the work.

-     *

-     * @param work     The unit of work that needs to be asynchronously executed.

-     * @param listener Notification listener for callbacks.

-     */

-    public <T extends Runnable> void scheduleWork(T work, NotificationListener<T> listener) {

-

-        if (work == null) {

-            throw new IllegalArgumentException("Work cannot be null");

-        }

-

-        Jsr237Work<T> jsr237Work = new Jsr237Work<T>(work);

-        try {

-            if (listener == null) {

-                jsr237WorkManager.schedule(jsr237Work);

-            } else {

-                Jsr237WorkListener<T> jsr237WorkListener = new Jsr237WorkListener<T>(listener, work);

-                jsr237WorkManager.schedule(jsr237Work, jsr237WorkListener);

-            }

-        } catch (IllegalArgumentException ex) {

-            if (listener != null) {

-                listener.workRejected(work);

-            } else {

-                throw new WorkSchedulerException(ex);

-            }

-        } catch (Exception ex) {

-            throw new WorkSchedulerException(ex);

-        }

-

-    }

-

-    public void destroy() {

-        if (jsr237WorkManager instanceof ThreadPoolWorkManager) {

-            ((ThreadPoolWorkManager)jsr237WorkManager).destroy();

-        }

-    }

-

-    /*

-     * WorkListener for keeping track of work status callbacks.

-     *

-     */

-    private class Jsr237WorkListener<T extends Runnable> implements WorkListener {

-

-        // Notification listener

-        private NotificationListener<T> listener;

-

-        // Work

-        private T work;

-

-        /*

-        * Initializes the notification listener.

-        */

-        public Jsr237WorkListener(NotificationListener<T> listener, T work) {

-            this.listener = listener;

-            this.work = work;

-        }

-

-        /*

-         * Callback when the work is accepted.

-         */

-        public void workAccepted(WorkEvent workEvent) {

-            T work = getWork();

-            listener.workAccepted(work);

-        }

-

-        /*

-         * Callback when the work is rejected.

-         */

-        public void workRejected(WorkEvent workEvent) {

-            T work = getWork();

-            listener.workRejected(work);

-        }

-

-        /*

-         * Callback when the work is started.

-         */

-        public void workStarted(WorkEvent workEvent) {

-            T work = getWork();

-            listener.workStarted(work);

-        }

-

-        /*

-         * Callback when the work is completed.

-         */

-        public void workCompleted(WorkEvent workEvent) {

-            T work = getWork();

-            Exception exception = workEvent.getException();

-            if (exception != null) {

-                listener.workFailed(work, exception);

-            } else {

-                listener.workCompleted(work);

-            }

-        }

-

-        /*

-        * Gets the underlying work from the work event.

-        */

-        private T getWork() {

-            return work;

-        }

-

-    }

-}

diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
deleted file mode 100644
index 5731ac5697..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.core.work;

-

-//import java.rmi.server.UID;

-import java.util.Collection;

-import java.util.Map;

-import java.util.concurrent.ConcurrentHashMap;

-import java.util.concurrent.ExecutorService;

-import java.util.concurrent.Executors;

-import java.util.concurrent.RejectedExecutionException;

-import java.util.concurrent.ThreadFactory;

-

-import org.osoa.sca.annotations.Destroy;

-

-import commonj.work.Work;

-import commonj.work.WorkEvent;

-import commonj.work.WorkException;

-import commonj.work.WorkItem;

-import commonj.work.WorkListener;

-import commonj.work.WorkManager;

-

-/**

- * A thread-pool based implementation for the JSR-237 work manager.

- * <p/>

- * <p/>

- * This implementation supports only local work.

- * <p/>

- * TODO Elaborate the implementation. </p>

- */

-public class ThreadPoolWorkManager implements WorkManager {

-

-    // Map of work items currently handled by the work manager

-    private Map<WorkItemImpl, WorkListener> workItems = new ConcurrentHashMap<WorkItemImpl, WorkListener>();

-

-    // Thread-pool

-    private ExecutorService executor;

-

-    /**

-     * Initializes the thread-pool.

-     *

-     * @param threadPoolSize Thread-pool size.

-     */

-    public ThreadPoolWorkManager(int threadPoolSize) {

-        

-        // Creates a new Executor, use a custom ThreadFactory that

-        // creates daemon threads.

-        executor = Executors.newFixedThreadPool(threadPoolSize, new ThreadFactory() {

-            public Thread newThread(Runnable r) {

-                Thread thread = new Thread(r);

-                thread.setDaemon(true);

-                return thread;

-            }

-        });

-    }

-

-    /**

-     * Schedules a unit of work asynchronously.

-     *

-     * @param work Work that needs to be scheduled.

-     * @return Work Work item representing the asynchronous work

-     */

-    public WorkItem schedule(Work work) throws IllegalArgumentException {

-        return schedule(work, null);

-    }

-

-    /**

-     * Schedules a unit of work asynchronously.

-     *

-     * @param work         Work that needs to be scheduled.

-     * @param workListener Work listener for callbacks.

-     * @return Work Work item representing the asynchronous work

-     */

-    public WorkItem schedule(Work work, WorkListener workListener) throws IllegalArgumentException {

-

-        WorkItemImpl workItem = new WorkItemImpl(null/*new UID().toString()*/, work);

-        if (workListener != null) {

-            workItems.put(workItem, workListener);

-        }

-        workAccepted(workItem, work);

-        if (scheduleWork(work, workItem)) {

-            return workItem;

-        } else {

-            workItem.setStatus(WorkEvent.WORK_REJECTED);

-            if (workListener != null) {

-                workListener.workRejected(new WorkEventImpl(workItem));

-            }

-            throw new IllegalArgumentException("Unable to schedule work");

-        }

-    }

-

-    /**

-     * Wait for all the specified units of work to finish.

-     *

-     * @param works   Units of the work that need to finish.

-     * @param timeout Timeout for waiting for the units of work to finish.

-     */

-    public boolean waitForAll(Collection works, long timeout) {

-        throw new UnsupportedOperationException("waitForAll not supported");

-    }

-

-    /**

-     * Wait for any of the specified units of work to finish.

-     *

-     * @param works   Units of the work that need to finish.

-     * @param timeout Timeout for waiting for the units of work to finish.

-     */

-    public Collection waitForAny(Collection works, long timeout) {

-        throw new UnsupportedOperationException("waitForAny not supported");

-    }

-

-    /**

-     * Method provided for subclasses to indicate a work acceptance.

-     *

-     * @param workItem Work item representing the work that was accepted.

-     * @param work     Work that was accepted.

-     */

-    private void workAccepted(final WorkItemImpl workItem, final Work work) {

-        WorkListener listener = workItems.get(workItem);

-        if (listener != null) {

-            workItem.setStatus(WorkEvent.WORK_ACCEPTED);

-            WorkEvent event = new WorkEventImpl(workItem);

-            listener.workAccepted(event);

-        }

-    }

-

-    /*

-     * Method to indicate a work start.

-     */

-    private void workStarted(final WorkItemImpl workItem, final Work work) {

-        WorkListener listener = workItems.get(workItem);

-        if (listener != null) {

-            workItem.setStatus(WorkEvent.WORK_STARTED);

-            WorkEvent event = new WorkEventImpl(workItem);

-            listener.workStarted(event);

-        }

-    }

-

-    /*

-     * Method to indicate a work completion.

-     */

-    private void workCompleted(final WorkItemImpl workItem, final Work work) {

-        workCompleted(workItem, work, null);

-    }

-

-    /*

-     * Method to indicate a work completion.

-     */

-    private void workCompleted(final WorkItemImpl workItem, final Work work, final WorkException exception) {

-        WorkListener listener = workItems.get(workItem);

-        if (listener != null) {

-            workItem.setStatus(WorkEvent.WORK_COMPLETED);

-            workItem.setResult(work);

-            workItem.setException(exception);

-            WorkEvent event = new WorkEventImpl(workItem);

-            listener.workCompleted(event);

-            workItems.remove(workItem);

-        }

-    }

-

-    /*

-     * Schedules the work using the ThreadPool.

-     */

-    private boolean scheduleWork(final Work work, final WorkItemImpl workItem) {

-        try {

-            executor.execute(new DecoratingWork(workItem, work));

-            return true;

-        } catch (RejectedExecutionException ex) {

-            return false;

-        }

-    }

-

-    /*

-     * Class that decorates the original worker so that it can get callbacks when work is done.

-     */

-    private final class DecoratingWork implements Runnable {

-

-        // Work item for this work.

-        private WorkItemImpl workItem;

-

-        // The original work.

-        private Work decoratedWork;

-

-        /*

-         * Initializes the work item and underlying work.

-         */

-        private DecoratingWork(final WorkItemImpl workItem, final Work decoratedWork) {

-            this.workItem = workItem;

-            this.decoratedWork = decoratedWork;

-        }

-

-        /*

-         * Overrides the run method.

-         */

-        public void run() {

-            workStarted(workItem, decoratedWork);

-            try {

-                decoratedWork.run();

-                workCompleted(workItem, decoratedWork);

-            } catch (Throwable th) {

-                workCompleted(workItem, decoratedWork, new WorkException(th.getMessage(), th));

-            }

-        }

-

-    }

-

-    @Destroy

-    public void destroy() {

-        executor.shutdown();

-    }

-

-}

diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
deleted file mode 100644
index 761f682c75..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.core.work;

-

-

-import commonj.work.WorkEvent;

-import commonj.work.WorkException;

-import commonj.work.WorkItem;

-

-/**

- * Default immutable implementation of the <code>WorkEvent</code> class.

- */

-class WorkEventImpl implements WorkEvent {

-    

-    // Work item for this event

-    private WorkItem workItem;

-

-    // Exception if something has gone wrong

-    private WorkException exception;

-

-    /**

-     * Instantiates the event.

-     *

-     * @param workItem Work item for this event.

-     */

-    public WorkEventImpl(final WorkItemImpl workItem) {

-        this.workItem = workItem;

-        this.exception = workItem.getException();

-    }

-

-    /**

-     * Returns the work type based on whether the work was accepted, started,

-     * rejected or completed.

-     *

-     * @return Work type.

-     */

-    public int getType() {

-        return workItem.getStatus();

-    }

-

-    /**

-     * Returns the work item associated with this work type.

-     *

-     * @return Work item.

-     */

-    public WorkItem getWorkItem() {

-        return workItem;

-    }

-

-    /**

-     * Returns the exception if the work completed with an exception.

-     *

-     * @return Work exception.

-     */

-    public WorkException getException() {

-        return exception;

-    }

-}

diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
deleted file mode 100644
index afa496435f..0000000000
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.core.work;

-

-import commonj.work.Work;

-import commonj.work.WorkException;

-import commonj.work.WorkItem;

-

-/**

- * An identity based immutable implementation of the <code>WorkItem</code>

- * interface.

- *

- */

-class WorkItemImpl implements WorkItem {

-    

-    // Id scoped for the VM

-    private String id;

-

-    // Status

-    private int status = -1;

-

-    // Result

-    private Work result;

-    

-    // Original work

-    private Work originalWork;

-

-    // Exception

-    private WorkException exception;

-

-    /**

-     * Instantiates an id for this item.

-     *

-     * @param id of this work event.

-     */

-    protected WorkItemImpl(final String id, final Work orginalWork) {

-        this.id = id;

-        this.originalWork = orginalWork;

-    }

-

-    /**

-     * Returns the id.

-     *

-     * @return Id of this item.

-     */

-    public String getId() {

-        return id;

-    }

-

-    /**

-     * Returns the original work.

-     *

-     * @return Original work.

-     */

-    public Work getOriginalWork() {

-        return originalWork;

-    }

-

-    /**

-     * Returns the work result if the work completed.

-     *

-     * @return Work.

-     * @throws WorkException If the work completed with an exception.

-     */

-    public Work getResult() {

-        return result;

-    }

-

-    /**

-     * Sets the result.

-     *

-     * @param result Result.

-     */

-    protected void setResult(final Work result) {

-        this.result = result;

-    }

-

-    /**

-     * Returns the exception if work completed with an exception.

-     *

-     * @return Work exception.

-     */

-    protected WorkException getException() {

-        return exception;

-    }

-

-    /**

-     * Sets the exception.

-     *

-     * @param exception Exception.

-     */

-    protected void setException(final WorkException exception) {

-        this.exception = exception;

-    }

-

-    /**

-     * Returns the work type based on whether the work was accepted, started,

-     * rejected or completed.

-     *

-     * @return Work status.

-     */

-    public int getStatus() {

-        return status;

-    }

-

-    /**

-     * Sets the status.

-     *

-     * @param status Status.

-     */

-    protected void setStatus(final int status) {

-        this.status = status;

-    }

-

-    /**

-     * @see Object#hashCode() 

-     */

-    @Override

-    public int hashCode() {

-        return id.hashCode();

-    }

-

-    /**

-     * Indicates whether some other object is "equal to" this one.

-     *

-     * @param obj Object to be compared.

-     * @return true if this object is the same as the obj argument; false

-     *         otherwise..

-     */

-    @Override

-    public boolean equals(final Object obj) {

-        return (obj != null) && (obj.getClass() == WorkItemImpl.class) && ((WorkItemImpl) obj).id.equals(id);

-    }

-

-    /**

-     * Compares this object with the specified object for order. Returns a

-     * negative integer, zero, or a positive integer as this object is less

-     * than, equal to, or greater than the specified object.

-     *

-     * @param o Object to be compared.

-     * @return A negative integer, zero, or a positive integer as this object

-     *         is less than, equal to, or greater than the specified object.

-     * @throws ClassCastException needs better documentation.

-     */

-    public int compareTo(final Object o) {

-        if (o.getClass() != WorkItemImpl.class) {

-            throw new ClassCastException(o.getClass().getName());

-        } else {

-            return ((WorkItemImpl) o).getId().compareTo(getId());

-        }

-    }

-}

diff --git a/branches/sca-android/modules/tuscany-assembly-xml/DISCLAIMER b/branches/sca-android/modules/core-spi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/DISCLAIMER
+++ b/branches/sca-android/modules/core-spi/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/LICENSE b/branches/sca-android/modules/core-spi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/LICENSE
+++ b/branches/sca-android/modules/core-spi/LICENSE
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/NOTICE b/branches/sca-android/modules/core-spi/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-assembly-xml/NOTICE
+++ b/branches/sca-android/modules/core-spi/NOTICE
diff --git a/branches/sca-android/modules/tuscany-core-spi/pom.xml b/branches/sca-android/modules/core-spi/pom.xml
index 72cfbe7a7c..72cfbe7a7c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/pom.xml
+++ b/branches/sca-android/modules/core-spi/pom.xml
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/doc/Context Model.emx b/branches/sca-android/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/doc/Context Model.emx
+++ b/branches/sca-android/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index 93fc219903..93fc219903 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index 822c9ccd84..822c9ccd84 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 8cd0978ff0..8cd0978ff0 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index fc8119578c..fc8119578c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 5435255708..5435255708 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index efc2f80dc7..efc2f80dc7 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 537c9d69d8..537c9d69d8 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index 1893dc57cc..1893dc57cc 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 0aa922afa0..0aa922afa0 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index 00f6961235..00f6961235 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index 4a204efdd1..4a204efdd1 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index e540ef683e..e540ef683e 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index 177dcfbb77..177dcfbb77 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index dec01a119b..dec01a119b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5d6daab23..a5d6daab23 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 37d15a8704..37d15a8704 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 95efa3d259..95efa3d259 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index b28f6ad483..b28f6ad483 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 9a452b5d54..9a452b5d54 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index 82b994577f..82b994577f 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 49bceac82b..49bceac82b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 900450f206..900450f206 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 371f9c9af2..371f9c9af2 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
index 4cca3b1e32..4cca3b1e32 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index a9f86c45ca..a9f86c45ca 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 084056278c..084056278c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index 7e798549b3..7e798549b3 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index b7306e48dd..b7306e48dd 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index d7e4fee1d9..d7e4fee1d9 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index e0c03b3db1..e0c03b3db1 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index 63c8cc162b..63c8cc162b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index d0a1b53563..d0a1b53563 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
index b85d19ba9a..b85d19ba9a 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
index 9be99c389c..9be99c389c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
index 4d91480295..4d91480295 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index db08098ae8..db08098ae8 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index fb58c72262..fb58c72262 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index 0e7a1ce103..0e7a1ce103 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index b4ec354988..b4ec354988 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index f640d9a227..f640d9a227 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index f10c6c6e5d..f10c6c6e5d 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index f30c92452b..f30c92452b 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 002bc90010..002bc90010 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index 104a490fa4..104a490fa4 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index a828995c5a..a828995c5a 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 30630cc2af..30630cc2af 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 465b385d57..465b385d57 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 728faf5d0c..728faf5d0c 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index 45bce4d8fb..45bce4d8fb 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 24f8c1a8fd..24f8c1a8fd 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 8798f31138..8798f31138 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 7cbf4c5ea6..7cbf4c5ea6 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index 9e05090845..9e05090845 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index 024c3af2f0..024c3af2f0 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
index 2f700671ca..2f700671ca 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
+++ b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-android/modules/tuscany-assembly/DISCLAIMER b/branches/sca-android/modules/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-assembly/DISCLAIMER
+++ b/branches/sca-android/modules/core/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-assembly/LICENSE b/branches/sca-android/modules/core/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-assembly/LICENSE
+++ b/branches/sca-android/modules/core/LICENSE
diff --git a/branches/sca-android/modules/tuscany-assembly/NOTICE b/branches/sca-android/modules/core/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-assembly/NOTICE
+++ b/branches/sca-android/modules/core/NOTICE
diff --git a/branches/sca-android/modules/core-android/pom.xml b/branches/sca-android/modules/core/pom.xml
index 0d0ee2c606..0d0ee2c606 100644
--- a/branches/sca-android/modules/core-android/pom.xml
+++ b/branches/sca-android/modules/core/pom.xml
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index 1e68564d1d..1e68564d1d 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index a96abce839..a96abce839 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index f730b2ff71..f730b2ff71 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 2d7cfefd16..2d7cfefd16 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index 7087df2a42..7087df2a42 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index e500e8ee20..e500e8ee20 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 5d7eab26fa..5d7eab26fa 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 68312e50f4..68312e50f4 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index f8c80135c8..f8c80135c8 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index 0393d31d61..0393d31d61 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index bd8f5e0aa1..bd8f5e0aa1 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index 7019c8c7d3..7019c8c7d3 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index bcf9a366c6..bcf9a366c6 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 9a94d6dff8..9a94d6dff8 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index d0fc6c969f..d0fc6c969f 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index 217e327184..217e327184 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index 08e69230da..08e69230da 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index fde3831cdf..fde3831cdf 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index a238ce3d4e..a238ce3d4e 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index 36a6dbcc5f..36a6dbcc5f 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index a262f311ef..a262f311ef 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 7d37ed496e..7d37ed496e 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index f9702abced..f9702abced 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index 5b347166b5..5b347166b5 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 936717d7fd..936717d7fd 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 7770c9133b..7770c9133b 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index 195971dc8f..195971dc8f 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index 99ec0d2bef..99ec0d2bef 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index c80dc19676..c80dc19676 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 4bbadff869..4bbadff869 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 100bf05d32..100bf05d32 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index 56df7d10a9..56df7d10a9 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index bacd652402..bacd652402 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index da8ce41ce7..da8ce41ce7 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 9b5e564081..9b5e564081 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 96ce410539..96ce410539 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 40ee01a434..40ee01a434 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index dfc3dcc95d..dfc3dcc95d 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index 3ccd357db7..3ccd357db7 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index e41b18c290..e41b18c290 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index c201b37a51..c201b37a51 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 3fa636ed26..3fa636ed26 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index a5f9cdc84a..a5f9cdc84a 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index 5c9ae8c706..5c9ae8c706 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index 4bc18fe80a..4bc18fe80a 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index 3dfc435e00..3dfc435e00 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index 4380dc18ab..4380dc18ab 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 786e91a788..786e91a788 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index fb476c3c7b..fb476c3c7b 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index eca2279024..eca2279024 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index e98c6ac9a8..e98c6ac9a8 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index 50b4b59d73..50b4b59d73 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index 8e8a89c963..8e8a89c963 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index b7cfb2c4c9..b7cfb2c4c9 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cd59fdb0aa..cd59fdb0aa 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 20ea4ca379..20ea4ca379 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 7ca30718b5..7ca30718b5 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 00bf9c831e..00bf9c831e 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index d5085289e9..d5085289e9 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index d6ce9b4582..d6ce9b4582 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 3e981556dc..3e981556dc 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index cad9279e5c..cad9279e5c 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index c9693761e8..c9693761e8 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 55244932c5..55244932c5 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index 487d2874b0..487d2874b0 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 62f1e3fb79..62f1e3fb79 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index c42700c9a6..c42700c9a6 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index 761430597c..761430597c 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index c2a3172fe2..c2a3172fe2 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 1c72359e58..1c72359e58 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index ea91c5973c..ea91c5973c 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index e5f23f9a0a..e5f23f9a0a 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 6ec5667cb1..6ec5667cb1 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 6c25dbd2d4..6c25dbd2d4 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 8708c6e11e..8708c6e11e 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c533822952..c533822952 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index f785647683..f785647683 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 7507248b32..7507248b32 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index a3c4e7ee1a..a3c4e7ee1a 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 29f43ed861..29f43ed861 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index b8b1d6bbe3..b8b1d6bbe3 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index d669711c40..d669711c40 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index bed8f14cdc..bed8f14cdc 100644
--- a/branches/sca-android/modules/core-android/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-android/modules/core-android/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-android/modules/core-android/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index b3d1d42ed3..b3d1d42ed3 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index d4cc0e64d8..d4cc0e64d8 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 13f5c14c77..13f5c14c77 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index b8a9d5a591..b8a9d5a591 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index a309ac4b15..a309ac4b15 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 5601d18746..5601d18746 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index 3725ce74b0..3725ce74b0 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 424f12800f..424f12800f 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 120fe861c8..120fe861c8 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index 971d9493c8..971d9493c8 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 504313921c..504313921c 100644
--- a/branches/sca-android/modules/core-android/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-android/modules/core-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index 1f2218aba8..1f2218aba8 100644
--- a/branches/sca-android/modules/core-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/branches/sca-android/modules/host-android/.classpath b/branches/sca-android/modules/host-android/.classpath
deleted file mode 100644
index a5b6e1a5ac..0000000000
--- a/branches/sca-android/modules/host-android/.classpath
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>

-	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>

-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>

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

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

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

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

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

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

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

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

-	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar"/>

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

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

-	<classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>

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

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

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

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

-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-commonj_1.1_spec/1.0/geronimo-commonj_1.1_spec-1.0.jar"/>

-	<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>

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

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

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

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

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

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

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

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

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

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

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

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

-	<classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.6/jaxb-impl-2.1.6.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb/reflection/jaxb2-reflection/2.1.4/jaxb2-reflection-2.1.4.jar"/>

-	<classpathentry kind="src" path="/tuscany-interface-java-jaxws"/>

-	<classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar"/>

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

-	<classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.5/axiom-api-1.2.5.jar"/>

-	<classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"/>

-	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/2.0.2/neethi-2.0.2.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.5/axiom-impl-1.2.5.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>

-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>

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

-	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>

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

-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android"/>

-	<classpathentry kind="output" path="target/classes"/>

-</classpath>

diff --git a/branches/sca-android/modules/host-android/.project b/branches/sca-android/modules/host-android/.project
deleted file mode 100644
index 7f49c40c5f..0000000000
--- a/branches/sca-android/modules/host-android/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<projectDescription>
-  <name>tuscany-host-embedded</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-assembly-xml</project>
-    <project>tuscany-assembly</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-interface</project>
-    <project>tuscany-definitions</project>
-    <project>tuscany-core-spi</project>
-    <project>tuscany-sca-api</project>
-    <project>tuscany-contribution</project>
-    <project>tuscany-contribution-namespace</project>
-    <project>tuscany-contribution-java</project>
-    <project>tuscany-assembly-xsd</project>
-    <project>tuscany-binding-sca</project>
-    <project>tuscany-core</project>
-    <project>tuscany-interface-java</project>
-    <project>tuscany-contribution-impl</project>
-    <project>tuscany-contribution-xml</project>
-    <project>tuscany-contribution-resource</project>
-    <project>tuscany-node</project>
-    <project>tuscany-domain</project>
-    <project>tuscany-domain-api</project>
-    <project>tuscany-node-api</project>
-    <project>tuscany-binding-sca-xml</project>
-    <project>tuscany-core-databinding</project>
-    <project>tuscany-databinding</project>
-    <project>tuscany-databinding-jaxb</project>
-    <project>tuscany-interface-java-xml</project>
-    <project>tuscany-interface-java-jaxws</project>
-    <project>tuscany-definitions-xml</project>
-    <project>tuscany-policy-xml</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-core-spi/DISCLAIMER b/branches/sca-android/modules/host-embedded/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-core-spi/DISCLAIMER
+++ b/branches/sca-android/modules/host-embedded/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-core-spi/LICENSE b/branches/sca-android/modules/host-embedded/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-core-spi/LICENSE
+++ b/branches/sca-android/modules/host-embedded/LICENSE
diff --git a/branches/sca-android/modules/tuscany-core-spi/NOTICE b/branches/sca-android/modules/host-embedded/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-core-spi/NOTICE
+++ b/branches/sca-android/modules/host-embedded/NOTICE
diff --git a/branches/sca-android/modules/host-android/pom.xml b/branches/sca-android/modules/host-embedded/pom.xml
index 224bd104c1..224bd104c1 100644
--- a/branches/sca-android/modules/host-android/pom.xml
+++ b/branches/sca-android/modules/host-embedded/pom.xml
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
index b45b418ccf..b45b418ccf 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
index 1bb0662118..1bb0662118 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
index a1f272cb06..a1f272cb06 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
index acd0fb91e4..acd0fb91e4 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 5f73dbe008..5f73dbe008 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
index 647443a88e..647443a88e 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
index bc2edb7de9..bc2edb7de9 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
index ffee6122d9..ffee6122d9 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
index 4f155473d8..4f155473d8 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
index 01adc4df82..01adc4df82 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
index b5e41dd097..b5e41dd097 100644
--- a/branches/sca-android/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
+++ b/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
index 10491df403..10491df403 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
index 67743517c2..67743517c2 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
index 7f29553994..7f29553994 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
index 6e71295044..6e71295044 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
index 10c174a00b..10c174a00b 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
index 3a215e537d..3a215e537d 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
index 5aea0a1dd1..5aea0a1dd1 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
index 4173d1b4e0..4173d1b4e0 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
index 3ed64536ef..3ed64536ef 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
index c0dd04ce33..c0dd04ce33 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
index 63412012ef..63412012ef 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
index ac8339b6ed..ac8339b6ed 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
index 3ab1041ada..3ab1041ada 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
index ac3724f429..ac3724f429 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
diff --git a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
index b13a218064..b13a218064 100644
--- a/branches/sca-android/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
+++ b/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
diff --git a/branches/sca-android/modules/host-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-android/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 7e2e11e4cc..7e2e11e4cc 100644
--- a/branches/sca-android/modules/host-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/branches/sca-android/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android/modules/host-android/src/test/resources/test.composite b/branches/sca-android/modules/host-embedded/src/test/resources/test.composite
index fcd33d3fcb..fcd33d3fcb 100644
--- a/branches/sca-android/modules/host-android/src/test/resources/test.composite
+++ b/branches/sca-android/modules/host-embedded/src/test/resources/test.composite
diff --git a/branches/sca-android/modules/host-android/src/test/resources/test.txt b/branches/sca-android/modules/host-embedded/src/test/resources/test.txt
index 7b13a7e01f..7b13a7e01f 100644
--- a/branches/sca-android/modules/host-android/src/test/resources/test.txt
+++ b/branches/sca-android/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/DISCLAIMER b/branches/sca-android/modules/implementation-java-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/DISCLAIMER
+++ b/branches/sca-android/modules/implementation-java-runtime/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/LICENSE b/branches/sca-android/modules/implementation-java-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/LICENSE
+++ b/branches/sca-android/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/NOTICE b/branches/sca-android/modules/implementation-java-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/NOTICE
+++ b/branches/sca-android/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/pom.xml b/branches/sca-android/modules/implementation-java-runtime/pom.xml
index cf450f3fc2..cf450f3fc2 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/pom.xml
+++ b/branches/sca-android/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index 7f531a7e8a..7f531a7e8a 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index c1d2a14ddd..c1d2a14ddd 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index 092736918a..092736918a 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index e7a5b3de03..e7a5b3de03 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 00bcdcbbc1..00bcdcbbc1 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index 0c91f31cc2..0c91f31cc2 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index f326ed4748..f326ed4748 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index a1cfa6c98d..a1cfa6c98d 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index edd003f196..edd003f196 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index f1fef2149e..f1fef2149e 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index e8bed559d0..e8bed559d0 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 0b97f3eb8b..0b97f3eb8b 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 89c845cd00..89c845cd00 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index 947db7110d..947db7110d 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index df71a24a07..df71a24a07 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index e8391f9e90..e8391f9e90 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index 4cd1e9fc18..4cd1e9fc18 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index ae2f71ba12..ae2f71ba12 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index fc33e8a005..fc33e8a005 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 4b6c061cbd..4b6c061cbd 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index 67e161df53..67e161df53 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 10a8195742..10a8195742 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index fd6376cd58..fd6376cd58 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 1ac7859e3e..1ac7859e3e 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index f8a9a6b3c4..f8a9a6b3c4 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index fd569e43aa..fd569e43aa 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index a6206ec0f8..a6206ec0f8 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index 406c95524f..406c95524f 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index a444b56846..a444b56846 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index f42a264c38..f42a264c38 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
index 1163c364c9..1163c364c9 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index e1a0c6d326..e1a0c6d326 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index a7b175cf9b..a7b175cf9b 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
index 210068841b..210068841b 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index ff7e906121..ff7e906121 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-android/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/branches/sca-android/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index 0323c15b09..0323c15b09 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
index c9b1987f25..c9b1987f25 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
index ef338297ef..ef338297ef 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index 1f34fc5e12..1f34fc5e12 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 4b7f78aabf..4b7f78aabf 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index ca2755f811..ca2755f811 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index 3b25724694..3b25724694 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
index 76947c2488..76947c2488 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index 2132e3c3e1..2132e3c3e1 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 59c810e7f0..59c810e7f0 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index 08b7bfacbe..08b7bfacbe 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index 12591b2382..12591b2382 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index 0ace1336df..0ace1336df 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index 46ab21eca7..46ab21eca7 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a6d2787a45..a6d2787a45 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index 7b3b5f0a36..7b3b5f0a36 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 4923233ea9..4923233ea9 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/DISCLAIMER b/branches/sca-android/modules/implementation-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/DISCLAIMER
+++ b/branches/sca-android/modules/implementation-java-xml/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/LICENSE b/branches/sca-android/modules/implementation-java-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/LICENSE
+++ b/branches/sca-android/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/NOTICE b/branches/sca-android/modules/implementation-java-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/NOTICE
+++ b/branches/sca-android/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/pom.xml b/branches/sca-android/modules/implementation-java-xml/pom.xml
index 549570e238..549570e238 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/pom.xml
+++ b/branches/sca-android/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 85cf3d7d0a..85cf3d7d0a 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index d66266fc0d..d66266fc0d 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-android/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ff43eebcfc..ff43eebcfc 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/branches/sca-android/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/AddService.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index 2e7d6a5ed1..2e7d6a5ed1 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/CalculatorService.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index f5df6a42e8..f5df6a42e8 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index 58d31bf217..58d31bf217 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/DivideService.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index 959312b464..959312b464 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/MultiplyService.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index 970d0c4d83..970d0c4d83 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/SubtractService.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index c1d867c687..c1d867c687 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 3336723dc0..3336723dc0 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index 3de8c80bd4..3de8c80bd4 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 0603553384..0603553384 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index 3d92031c65..3d92031c65 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index cddc134c2c..cddc134c2c 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 9147133d5d..9147133d5d 100644
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/branches/sca-android/modules/tuscany-implementation-java/DISCLAIMER b/branches/sca-android/modules/implementation-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/DISCLAIMER
+++ b/branches/sca-android/modules/implementation-java/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-implementation-java/LICENSE b/branches/sca-android/modules/implementation-java/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/LICENSE
+++ b/branches/sca-android/modules/implementation-java/LICENSE
diff --git a/branches/sca-android/modules/tuscany-implementation-java/NOTICE b/branches/sca-android/modules/implementation-java/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/NOTICE
+++ b/branches/sca-android/modules/implementation-java/NOTICE
diff --git a/branches/sca-android/modules/tuscany-implementation-java/pom.xml b/branches/sca-android/modules/implementation-java/pom.xml
index 3130bd2890..3130bd2890 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/pom.xml
+++ b/branches/sca-android/modules/implementation-java/pom.xml
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index ea3d9f0b59..ea3d9f0b59 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index 06cfabeb44..06cfabeb44 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index fac3f9a0dd..fac3f9a0dd 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 1b90be3043..1b90be3043 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index f6695bde6d..f6695bde6d 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 61fe2a1f0b..61fe2a1f0b 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 5524c12c18..5524c12c18 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index ff269713df..ff269713df 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index 1ed5045429..1ed5045429 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index 35f8920b33..35f8920b33 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 169f7fd6e3..169f7fd6e3 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index cf1bf096dd..cf1bf096dd 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index fb59566222..fb59566222 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 0b80b59600..0b80b59600 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index fac5643eed..fac5643eed 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 8af1256a17..8af1256a17 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index c6ac1cd69c..c6ac1cd69c 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index 3928f59482..3928f59482 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
index 79f90baece..79f90baece 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 6acaa3e17d..6acaa3e17d 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 739445c90a..739445c90a 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 1c34a50762..1c34a50762 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index 2db58006e6..2db58006e6 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index 8ad0b7cc43..8ad0b7cc43 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 9e0ce3e427..9e0ce3e427 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index dd879e66fa..dd879e66fa 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index c137de4e4a..c137de4e4a 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 962bd5a5d3..962bd5a5d3 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index 2fa4428a1f..2fa4428a1f 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 20ec93448c..20ec93448c 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 9864402b12..9864402b12 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 6b6f6579d9..6b6f6579d9 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 277313606f..277313606f 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index f0e0f65587..f0e0f65587 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index 14124f0b31..14124f0b31 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index f85cc40248..f85cc40248 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 010713d14f..010713d14f 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 21ebd433a7..21ebd433a7 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 8a50d978e3..8a50d978e3 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index 9c96567844..9c96567844 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index 4281cfe358..4281cfe358 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 94ceb2d3a5..94ceb2d3a5 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index ec3c2c4bb6..ec3c2c4bb6 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index bb460e2840..bb460e2840 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 11100cf45e..11100cf45e 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e416f09f85..e416f09f85 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index b1168a586a..b1168a586a 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 736bc6e691..736bc6e691 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index d800450453..d800450453 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index a54c418af8..a54c418af8 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index d7a8746c05..d7a8746c05 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index c96240c82b..c96240c82b 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index c801c92092..c801c92092 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index aa3c595d40..aa3c595d40 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index a7822cf150..a7822cf150 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index b2492e60fb..b2492e60fb 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 659f629be5..659f629be5 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index 2c355fae72..2c355fae72 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 096ec970eb..096ec970eb 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index dc9de12632..dc9de12632 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index 5691c773a5..5691c773a5 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index 809f992e7f..809f992e7f 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index c48977d201..c48977d201 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index 5be57dcca5..5be57dcca5 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 252c7c725d..252c7c725d 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index c794b0a800..c794b0a800 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index e35168180c..e35168180c 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index d1dfb2fb0c..d1dfb2fb0c 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index 3df561ef33..3df561ef33 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 6dc91bec22..6dc91bec22 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index 41d277e377..41d277e377 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index 5ff99b1265..5ff99b1265 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 032b821c79..032b821c79 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index dac4d1864f..dac4d1864f 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index 48c11c5c87..48c11c5c87 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index 976de72ae7..976de72ae7 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 9fb7b57f2e..9fb7b57f2e 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index a064f081d5..a064f081d5 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
index d138a03f33..d138a03f33 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index 044437959b..044437959b 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 8df2b5cb16..8df2b5cb16 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 47ca01a63a..47ca01a63a 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index 91a3d7e7e4..91a3d7e7e4 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 02bebca8eb..02bebca8eb 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index 63a02614fc..63a02614fc 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 9e3db807ba..9e3db807ba 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index 1ffae27129..1ffae27129 100644
--- a/branches/sca-android/modules/tuscany-implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/DISCLAIMER b/branches/sca-android/modules/policy-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/DISCLAIMER
+++ b/branches/sca-android/modules/policy-xml/DISCLAIMER
diff --git a/branches/sca-android/modules/tuscany-policy-xml/LICENSE b/branches/sca-android/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/LICENSE
+++ b/branches/sca-android/modules/policy-xml/LICENSE
diff --git a/branches/sca-android/modules/tuscany-policy-xml/NOTICE b/branches/sca-android/modules/policy-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/NOTICE
+++ b/branches/sca-android/modules/policy-xml/NOTICE
diff --git a/branches/sca-android/modules/tuscany-policy-xml/pom.xml b/branches/sca-android/modules/policy-xml/pom.xml
index 8373592b49..8373592b49 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/pom.xml
+++ b/branches/sca-android/modules/policy-xml/pom.xml
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index b54adf492b..b54adf492b 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index e588f93663..e588f93663 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index a69e3aca3a..a69e3aca3a 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 655b592665..655b592665 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index 53231f704e..53231f704e 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index cf58964a89..cf58964a89 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index 4ad09baf55..4ad09baf55 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index cf4eef074f..cf4eef074f 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index 1977e544c4..1977e544c4 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-android/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0741e3eb76..0741e3eb76 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/branches/sca-android/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java b/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
index 56d9a1eba8..56d9a1eba8 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
+++ b/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 15b1eb149c..15b1eb149c 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
index ce999539bb..ce999539bb 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-android/modules/tuscany-policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/branches/sca-android/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index e01a29863a..e01a29863a 100644
--- a/branches/sca-android/modules/tuscany-policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/branches/sca-android/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/.classpath b/branches/sca-android/modules/tuscany-assembly-xml/.classpath
deleted file mode 100644
index 3f660b27c9..0000000000
--- a/branches/sca-android/modules/tuscany-assembly-xml/.classpath
+++ /dev/null
@@ -1,40 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
-  <classpathentry kind="src" path="/tuscany-assembly"/>
-  <classpathentry kind="src" path="/tuscany-policy"/>
-  <classpathentry kind="src" path="/tuscany-extensibility"/>
-  <classpathentry kind="src" path="/tuscany-interface"/>
-  <classpathentry kind="src" path="/tuscany-definitions"/>
-  <classpathentry kind="src" path="/tuscany-assembly-xsd"/>
-  <classpathentry kind="src" path="/tuscany-contribution"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
-  <classpathentry kind="src" path="/tuscany-contribution-impl"/>
-  <classpathentry kind="src" path="/tuscany-contribution-xml"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar"/>
-  <classpathentry kind="src" path="/tuscany-contribution-java"/>
-  <classpathentry kind="src" path="/tuscany-core-spi"/>
-  <classpathentry kind="src" path="/tuscany-sca-api"/>
-  <classpathentry kind="src" path="/tuscany-contribution-namespace"/>
-  <classpathentry kind="src" path="/tuscany-contribution-resource"/>
-  <classpathentry kind="src" path="/tuscany-definitions-xml"/>
-  <classpathentry kind="src" path="/tuscany-policy-xml"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.5/axiom-api-1.2.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/2.0.2/neethi-2.0.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.5/axiom-impl-1.2.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
-  <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
-</classpath>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/.project b/branches/sca-android/modules/tuscany-assembly-xml/.project
deleted file mode 100644
index 975169eed5..0000000000
--- a/branches/sca-android/modules/tuscany-assembly-xml/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<projectDescription>
-  <name>tuscany-assembly-xml</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-assembly</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-interface</project>
-    <project>tuscany-definitions</project>
-    <project>tuscany-assembly-xsd</project>
-    <project>tuscany-contribution</project>
-    <project>tuscany-contribution-impl</project>
-    <project>tuscany-contribution-xml</project>
-    <project>tuscany-contribution-java</project>
-    <project>tuscany-core-spi</project>
-    <project>tuscany-sca-api</project>
-    <project>tuscany-contribution-namespace</project>
-    <project>tuscany-contribution-resource</project>
-    <project>tuscany-definitions-xml</project>
-    <project>tuscany-policy-xml</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-assembly-xml/.settings/org.eclipse.jdt.core.prefs b/branches/sca-android/modules/tuscany-assembly-xml/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 33e67d2469..0000000000
--- a/branches/sca-android/modules/tuscany-assembly-xml/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 20 19:20:00 PDT 2008

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/branches/sca-android/modules/tuscany-assembly/.classpath b/branches/sca-android/modules/tuscany-assembly/.classpath
deleted file mode 100644
index 9c1dfd40f1..0000000000
--- a/branches/sca-android/modules/tuscany-assembly/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
-  <classpathentry kind="src" path="/tuscany-definitions"/>
-  <classpathentry kind="src" path="/tuscany-extensibility"/>
-  <classpathentry kind="src" path="/tuscany-policy"/>
-  <classpathentry kind="src" path="/tuscany-interface"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
-</classpath>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-assembly/.project b/branches/sca-android/modules/tuscany-assembly/.project
deleted file mode 100644
index 334e14be4d..0000000000
--- a/branches/sca-android/modules/tuscany-assembly/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<projectDescription>
-  <name>tuscany-assembly</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-definitions</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-interface</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-assembly/.settings/org.eclipse.jdt.core.prefs b/branches/sca-android/modules/tuscany-assembly/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 798d84aa9b..0000000000
--- a/branches/sca-android/modules/tuscany-assembly/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 20 19:19:29 PDT 2008

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/branches/sca-android/modules/tuscany-core-spi/.classpath b/branches/sca-android/modules/tuscany-core-spi/.classpath
deleted file mode 100644
index 541760ca35..0000000000
--- a/branches/sca-android/modules/tuscany-core-spi/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
-  <classpathentry kind="src" path="/tuscany-assembly"/>
-  <classpathentry kind="src" path="/tuscany-policy"/>
-  <classpathentry kind="src" path="/tuscany-extensibility"/>
-  <classpathentry kind="src" path="/tuscany-interface"/>
-  <classpathentry kind="src" path="/tuscany-definitions"/>
-  <classpathentry kind="src" path="/tuscany-contribution"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
-  <classpathentry kind="src" path="/tuscany-sca-api"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
-</classpath>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-core-spi/.project b/branches/sca-android/modules/tuscany-core-spi/.project
deleted file mode 100644
index 9f6a857423..0000000000
--- a/branches/sca-android/modules/tuscany-core-spi/.project
+++ /dev/null
@@ -1,21 +0,0 @@
-<projectDescription>
-  <name>tuscany-core-spi</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-assembly</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-interface</project>
-    <project>tuscany-definitions</project>
-    <project>tuscany-contribution</project>
-    <project>tuscany-sca-api</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-core-spi/.settings/org.eclipse.jdt.core.prefs b/branches/sca-android/modules/tuscany-core-spi/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 910a03ce95..0000000000
--- a/branches/sca-android/modules/tuscany-core-spi/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 20 19:19:38 PDT 2008

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
deleted file mode 100644
index 668866113e..0000000000
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.work;

-

-/**

- * A callback interface that can be optionally used for registering 

- * interest in status of asynchronously scheduled unit of work.

- *

- */

-public interface NotificationListener<T extends Runnable> {

-    

-    /**

-     * Callback method when the unit of work is accepted.

-     * 

-     * @param work Work that was accepted.

-     */

-    void workAccepted(T work);

-    

-    /**

-     * Callback method when the unit of work is successfully completed.

-     * 

-     * @param work Work that was successfully completed.

-     */

-    void workCompleted(T work);

-    

-    /**

-     * Callback when the unit of work is started.

-     * 

-     * @param work Unit of work that was started.

-     */

-    void workStarted(T work);

-    

-    /**

-     * Callback when the unit of work is rejected.

-     * 

-     * @param work Unit of work that was rejected.

-     */

-    void workRejected(T work);

-    

-    /**

-     * Callback when the unit of work fails to complete.

-     * 

-     * @param work Unit of work that failed to complete.

-     * @param error Error that caused the unit of work to fail.

-     */

-    void workFailed(T work, Throwable error);

-    

-    

-

-}

diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
deleted file mode 100644
index fd0ed52752..0000000000
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.work;

-

-/**

- * Defines the contract for scheduling asynchronous units of work.

- * 

- * <p>

- * Units of work can be scheduled with an optional <code>NotificationListener</code>.

- * If a notification listener is specified, the caller will be notified regarding the 

- * status of the work. The unit of work can either be completed, rejected or completed 

- * with an error. If the work completed with an error, the caller is notified with the 

- * error details.

- * </p>

- *

- */

-public interface WorkScheduler {

-    

-    /**

-     * Schedules a unit of work for future execution. The notification listener 

-     * is used to register interest in callbacks regarding the status of the work.

-     * 

-     * @param work The unit of work that needs to be asynchronously executed.

-     * @param listener Notification listener for callbacks.

-     */

-    <T extends Runnable>void scheduleWork(T work, NotificationListener<T> listener);

-    

-    /**

-     * Schedules a unit of work for future execution. The notification listener 

-     * is used to register interest in callbacks regarding the status of the work.

-     * 

-     * @param work The unit of work that needs to be asynchronously executed.

-     */

-    <T extends Runnable>void scheduleWork(T work);

-

-    /**

-     * Destroys the work scheduler

-     */

-    void destroy();

-

-}

diff --git a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
deleted file mode 100644
index 5ec6f8299d..0000000000
--- a/branches/sca-android/modules/tuscany-core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.work;

-

-

-/**

- * Exception thrown by the work scheduler in case of unexpected exceptions.

- * 

- * @version $Rev: 567542 $ $Date: 2007-08-19 22:13:29 -0700 (Sun, 19 Aug 2007) $

- *

- */

-public class WorkSchedulerException extends RuntimeException {

-    private static final long serialVersionUID = 1L;

-

-    public WorkSchedulerException() {

-        super();

-    }

-

-    public WorkSchedulerException(String message, Throwable cause) {

-        super(message, cause);

-    }

-

-    public WorkSchedulerException(String message) {

-        super(message);

-    }

-

-    public WorkSchedulerException(Throwable cause) {

-        super(cause);

-    }

-

-}

diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/.classpath b/branches/sca-android/modules/tuscany-implementation-java-runtime/.classpath
deleted file mode 100644
index ae8a04f371..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
-  <classpathentry kind="src" path="/tuscany-core-spi"/>
-  <classpathentry kind="src" path="/tuscany-extensibility"/>
-  <classpathentry kind="src" path="/tuscany-sca-api"/>
-  <classpathentry kind="src" path="/tuscany-assembly"/>
-  <classpathentry kind="src" path="/tuscany-policy"/>
-  <classpathentry kind="src" path="/tuscany-interface"/>
-  <classpathentry kind="src" path="/tuscany-definitions"/>
-  <classpathentry kind="src" path="/tuscany-contribution"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar"/>
-  <classpathentry kind="src" path="/tuscany-databinding"/>
-  <classpathentry kind="src" path="/tuscany-core"/>
-  <classpathentry kind="src" path="/tuscany-contribution-java"/>
-  <classpathentry kind="src" path="/tuscany-interface-java"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-commonj_1.1_spec/1.0/geronimo-commonj_1.1_spec-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
-  <classpathentry kind="src" path="/tuscany-implementation-java"/>
-  <classpathentry kind="src" path="/tuscany-implementation-java-xml"/>
-  <classpathentry kind="src" path="/tuscany-assembly-xml"/>
-  <classpathentry kind="src" path="/tuscany-contribution-namespace"/>
-  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
-  <classpathentry kind="src" path="/tuscany-interface-java-xml"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
-</classpath>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/.project b/branches/sca-android/modules/tuscany-implementation-java-runtime/.project
deleted file mode 100644
index 04641c6b07..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<projectDescription>
-  <name>tuscany-implementation-java-runtime</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-core-spi</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-sca-api</project>
-    <project>tuscany-assembly</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-interface</project>
-    <project>tuscany-definitions</project>
-    <project>tuscany-contribution</project>
-    <project>tuscany-databinding</project>
-    <project>tuscany-core</project>
-    <project>tuscany-contribution-java</project>
-    <project>tuscany-interface-java</project>
-    <project>tuscany-implementation-java</project>
-    <project>tuscany-implementation-java-xml</project>
-    <project>tuscany-assembly-xml</project>
-    <project>tuscany-contribution-namespace</project>
-    <project>tuscany-interface-java-xml</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-implementation-java-runtime/.settings/org.eclipse.jdt.core.prefs b/branches/sca-android/modules/tuscany-implementation-java-runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ef585c634f..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java-runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 20 19:21:26 PDT 2008

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/.classpath b/branches/sca-android/modules/tuscany-implementation-java-xml/.classpath
deleted file mode 100644
index 439458770c..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/.classpath
+++ /dev/null
@@ -1,51 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
-  <classpathentry kind="src" path="/tuscany-assembly-xml"/>
-  <classpathentry kind="src" path="/tuscany-assembly"/>
-  <classpathentry kind="src" path="/tuscany-policy"/>
-  <classpathentry kind="src" path="/tuscany-extensibility"/>
-  <classpathentry kind="src" path="/tuscany-interface"/>
-  <classpathentry kind="src" path="/tuscany-definitions"/>
-  <classpathentry kind="src" path="/tuscany-contribution"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
-  <classpathentry kind="src" path="/tuscany-contribution-namespace"/>
-  <classpathentry kind="src" path="/tuscany-core-spi"/>
-  <classpathentry kind="src" path="/tuscany-sca-api"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar"/>
-  <classpathentry kind="src" path="/tuscany-contribution-java"/>
-  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
-  <classpathentry kind="src" path="/tuscany-binding-sca"/>
-  <classpathentry kind="src" path="/tuscany-core"/>
-  <classpathentry kind="src" path="/tuscany-interface-java"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-commonj_1.1_spec/1.0/geronimo-commonj_1.1_spec-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
-  <classpathentry kind="src" path="/tuscany-contribution-impl"/>
-  <classpathentry kind="src" path="/tuscany-contribution-xml"/>
-  <classpathentry kind="src" path="/tuscany-contribution-resource"/>
-  <classpathentry kind="src" path="/tuscany-node"/>
-  <classpathentry kind="src" path="/tuscany-domain"/>
-  <classpathentry kind="src" path="/tuscany-domain-api"/>
-  <classpathentry kind="src" path="/tuscany-node-api"/>
-  <classpathentry kind="src" path="/tuscany-definitions-xml"/>
-  <classpathentry kind="src" path="/tuscany-policy-xml"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.5/axiom-api-1.2.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/2.0.2/neethi-2.0.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.5/axiom-impl-1.2.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
-  <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
-  <classpathentry kind="src" path="/tuscany-implementation-java"/>
-  <classpathentry kind="src" path="/tuscany-interface-java-xml"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
-</classpath>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/.project b/branches/sca-android/modules/tuscany-implementation-java-xml/.project
deleted file mode 100644
index c9dbd24603..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<projectDescription>
-  <name>tuscany-implementation-java-xml</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-assembly-xml</project>
-    <project>tuscany-assembly</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-interface</project>
-    <project>tuscany-definitions</project>
-    <project>tuscany-contribution</project>
-    <project>tuscany-contribution-namespace</project>
-    <project>tuscany-core-spi</project>
-    <project>tuscany-sca-api</project>
-    <project>tuscany-contribution-java</project>
-    <project>tuscany-binding-sca</project>
-    <project>tuscany-core</project>
-    <project>tuscany-interface-java</project>
-    <project>tuscany-contribution-impl</project>
-    <project>tuscany-contribution-xml</project>
-    <project>tuscany-contribution-resource</project>
-    <project>tuscany-node</project>
-    <project>tuscany-domain</project>
-    <project>tuscany-domain-api</project>
-    <project>tuscany-node-api</project>
-    <project>tuscany-definitions-xml</project>
-    <project>tuscany-policy-xml</project>
-    <project>tuscany-implementation-java</project>
-    <project>tuscany-interface-java-xml</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-implementation-java-xml/.settings/org.eclipse.jdt.core.prefs b/branches/sca-android/modules/tuscany-implementation-java-xml/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c373d32c5c..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java-xml/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 20 19:21:23 PDT 2008

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/branches/sca-android/modules/tuscany-implementation-java/.classpath b/branches/sca-android/modules/tuscany-implementation-java/.classpath
deleted file mode 100644
index a83c6d265d..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java/.classpath
+++ /dev/null
@@ -1,19 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
-  <classpathentry kind="src" path="/tuscany-assembly"/>
-  <classpathentry kind="src" path="/tuscany-policy"/>
-  <classpathentry kind="src" path="/tuscany-extensibility"/>
-  <classpathentry kind="src" path="/tuscany-interface"/>
-  <classpathentry kind="src" path="/tuscany-definitions"/>
-  <classpathentry kind="src" path="/tuscany-interface-java"/>
-  <classpathentry kind="src" path="/tuscany-sca-api"/>
-  <classpathentry kind="src" path="/tuscany-contribution"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
-</classpath>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-implementation-java/.project b/branches/sca-android/modules/tuscany-implementation-java/.project
deleted file mode 100644
index 4b8a0dfdbf..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<projectDescription>
-  <name>tuscany-implementation-java</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-assembly</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-interface</project>
-    <project>tuscany-definitions</project>
-    <project>tuscany-interface-java</project>
-    <project>tuscany-sca-api</project>
-    <project>tuscany-contribution</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-implementation-java/.settings/org.eclipse.jdt.core.prefs b/branches/sca-android/modules/tuscany-implementation-java/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index efa5a414bf..0000000000
--- a/branches/sca-android/modules/tuscany-implementation-java/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 20 19:21:19 PDT 2008

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/branches/sca-android/modules/tuscany-policy-xml/.classpath b/branches/sca-android/modules/tuscany-policy-xml/.classpath
deleted file mode 100644
index d4a80d05ca..0000000000
--- a/branches/sca-android/modules/tuscany-policy-xml/.classpath
+++ /dev/null
@@ -1,29 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
-  <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/2.0.2/neethi-2.0.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.5/axiom-api-1.2.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.5/axiom-impl-1.2.5.jar"/>
-  <classpathentry kind="src" path="/tuscany-contribution"/>
-  <classpathentry kind="src" path="/tuscany-assembly"/>
-  <classpathentry kind="src" path="/tuscany-policy"/>
-  <classpathentry kind="src" path="/tuscany-extensibility"/>
-  <classpathentry kind="src" path="/tuscany-interface"/>
-  <classpathentry kind="src" path="/tuscany-definitions"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
-</classpath>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-policy-xml/.project b/branches/sca-android/modules/tuscany-policy-xml/.project
deleted file mode 100644
index effe3b2ca5..0000000000
--- a/branches/sca-android/modules/tuscany-policy-xml/.project
+++ /dev/null
@@ -1,20 +0,0 @@
-<projectDescription>
-  <name>tuscany-policy-xml</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>tuscany-contribution</project>
-    <project>tuscany-assembly</project>
-    <project>tuscany-policy</project>
-    <project>tuscany-extensibility</project>
-    <project>tuscany-interface</project>
-    <project>tuscany-definitions</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/branches/sca-android/modules/tuscany-policy-xml/.settings/org.eclipse.jdt.core.prefs b/branches/sca-android/modules/tuscany-policy-xml/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c759c0227..0000000000
--- a/branches/sca-android/modules/tuscany-policy-xml/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 20 19:19:35 PDT 2008

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5