Moving 1.x branches

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

720 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/.classpath b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/.classpath
index 168313b5c6..168313b5c6 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/.classpath
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/.classpath
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/.project b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/.project
index a9a7150930..a9a7150930 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/.project
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/.project
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/AndroidManifest.xml b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/AndroidManifest.xml
index 8f419508ce..8f419508ce 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/AndroidManifest.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/AndroidManifest.xml
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/XMLConstants.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/XMLConstants.java
index 2159723b20..2159723b20 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/XMLConstants.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/XMLConstants.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/namespace/QName.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/namespace/QName.java
index 3461dd1cab..3461dd1cab 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/namespace/QName.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/namespace/QName.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/Result.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/Result.java
index dd3517c8cc..dd3517c8cc 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/Result.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/Result.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/Source.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/Source.java
index 5467229cc7..5467229cc7 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/Source.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/Source.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/dom/DOMSource.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/dom/DOMSource.java
index a55864a04c..a55864a04c 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/dom/DOMSource.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/dom/DOMSource.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/sax/SAXSource.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/sax/SAXSource.java
index cc09fee0ae..cc09fee0ae 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/sax/SAXSource.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/javax/xml/transform/sax/SAXSource.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/ContextRegistry.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/ContextRegistry.java
index 312c0059db..312c0059db 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/ContextRegistry.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/ContextRegistry.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexResource.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexResource.java
index fb9029547f..fb9029547f 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexResource.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexResource.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLConnection.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLConnection.java
index af0e93b043..af0e93b043 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLConnection.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLConnection.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLStreamHandler.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLStreamHandler.java
index a5c1507e0d..a5c1507e0d 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLStreamHandler.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLStreamHandler.java
diff --git a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLStreamHandlerFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLStreamHandlerFactory.java
index 5bb53dcd2e..5bb53dcd2e 100644
--- a/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLStreamHandlerFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/android-jdk-classes/src/org/apache/tuscany/sca/android/DexURLStreamHandlerFactory.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/assembly-xml/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/LICENSE
diff --git a/branches/sca-android-r643746/modules/assembly-xml/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/NOTICE
diff --git a/branches/sca-android-r643746/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/pom.xml
index 1580311fff..1580311fff 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/pom.xml
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index b94d9e0927..b94d9e0927 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 2950ef5a04..2950ef5a04 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 241e18badf..241e18badf 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 760e202ed2..760e202ed2 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index 2f3f66e14f..2f3f66e14f 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index e939fe2c05..e939fe2c05 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index c74c5bfb5b..c74c5bfb5b 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index 43e0242b7e..43e0242b7e 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 3f471838fc..3f471838fc 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 8e441f14d3..8e441f14d3 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index 8ba293d755..8ba293d755 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index a4200a3881..a4200a3881 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index c862a6f127..c862a6f127 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index 7fd642221b..7fd642221b 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index 360cfbbacc..360cfbbacc 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
index 2ee4abd99a..2ee4abd99a 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index ffd88cc4a4..ffd88cc4a4 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 4fe068142d..4fe068142d 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 5ead95df9d..5ead95df9d 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index 6db364950a..6db364950a 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index 6f0ef3ad96..6f0ef3ad96 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
index 5b9292cb17..5b9292cb17 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index b28a01e156..b28a01e156 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index acbd44dbc9..acbd44dbc9 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 8512dcefa1..8512dcefa1 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index aa95b98a31..aa95b98a31 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 4546fddb2d..4546fddb2d 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 2dbecdabb7..2dbecdabb7 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 2da2b56e8e..2da2b56e8e 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 0e7a48c698..0e7a48c698 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 7bc7ccdb83..7bc7ccdb83 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bcc8c54dc8..bcc8c54dc8 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index b79cb6b7b7..b79cb6b7b7 100644
--- a/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/branches/sca-android-r643746/modules/assembly/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/assembly/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/assembly/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/assembly/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/LICENSE
diff --git a/branches/sca-android-r643746/modules/assembly/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/assembly/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/NOTICE
diff --git a/branches/sca-android-r643746/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/pom.xml
index b34e5d21a1..b34e5d21a1 100644
--- a/branches/sca-android-r643746/modules/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/pom.xml
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index a234083bef..a234083bef 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 514106208d..514106208d 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index 9cdb51dad0..9cdb51dad0 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 13e69cef36..13e69cef36 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 04f0dd8b47..04f0dd8b47 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index dba3e9f1ae..dba3e9f1ae 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 028a10c995..028a10c995 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index c8a36cc555..c8a36cc555 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 132569ded3..132569ded3 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 998540612b..998540612b 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index 5ce75aa7b4..5ce75aa7b4 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 74110329f5..74110329f5 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index c4ad4fa0cb..c4ad4fa0cb 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index bd8f97910e..bd8f97910e 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index 8b55127870..8b55127870 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 2f7b2d0da4..2f7b2d0da4 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index a412bcee24..a412bcee24 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 1bd27d07b3..1bd27d07b3 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index a717715554..a717715554 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 1205c4ce6c..1205c4ce6c 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index ce998c0662..ce998c0662 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index ad47c4c5aa..ad47c4c5aa 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index a93c3c5ee3..a93c3c5ee3 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 2ca8589b1a..2ca8589b1a 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 1eb2188568..1eb2188568 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 8828e36970..8828e36970 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 874164e78a..874164e78a 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index ece8eeb028..ece8eeb028 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 881d7df5e4..881d7df5e4 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index c63bee0303..c63bee0303 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index bd457b3c34..bd457b3c34 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index e0ac9ada03..e0ac9ada03 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 050a7e5cb5..050a7e5cb5 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index c2c91f715e..c2c91f715e 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
index 5630d19366..5630d19366 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 88468938fd..88468938fd 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
index 70ec19288a..70ec19288a 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
index ec25c8e2a7..ec25c8e2a7 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
index 791d131871..791d131871 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index caa212ccdf..caa212ccdf 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index 142bed9d63..142bed9d63 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
index 9040b8bd99..9040b8bd99 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index cda3c5b91a..cda3c5b91a 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
index c7a4990230..c7a4990230 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
index b2f96c30cc..b2f96c30cc 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
index 2bd010c489..2bd010c489 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
index ae9ed87035..ae9ed87035 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
index 0e290865bd..0e290865bd 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index e50d65f1d3..e50d65f1d3 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index 32a39fbb5f..32a39fbb5f 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
index 396cf011aa..396cf011aa 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
index d2eeb51ee7..d2eeb51ee7 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 75cb91189b..75cb91189b 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index 16dc8394ce..16dc8394ce 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index ba58b50748..ba58b50748 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 9214df05a9..9214df05a9 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index f51162598b..f51162598b 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index c8af31eee8..c8af31eee8 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index e30ff1e725..e30ff1e725 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e5aa4e2db7..e5aa4e2db7 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 799e1c2e23..799e1c2e23 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 7432b655e9..7432b655e9 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index a292857cd2..a292857cd2 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 26829aa172..26829aa172 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 5d9c00ea82..5d9c00ea82 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index ad91c5ffa4..ad91c5ffa4 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 3bc3dfc6af..3bc3dfc6af 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index 5cf062821a..5cf062821a 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 874efe45da..874efe45da 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 38b6cd7ce3..38b6cd7ce3 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 81bed59e1a..81bed59e1a 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 73604736a5..73604736a5 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 186e98cd5e..186e98cd5e 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index b01bd42a96..b01bd42a96 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 2c8f426f82..2c8f426f82 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-android-r643746/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 2c8bf309df..2c8bf309df 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index a6b594f311..a6b594f311 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 698623ee1a..698623ee1a 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index 8e82efd04b..8e82efd04b 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index e020bdbc9a..e020bdbc9a 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index 996eb40b75..996eb40b75 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
index 609e1733aa..609e1733aa 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index bef6b47ee7..bef6b47ee7 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index b87ffc5905..b87ffc5905 100644
--- a/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/.classpath b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/.classpath
index 6403d2bc4b..6403d2bc4b 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/.classpath
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/.classpath
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/.project b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/.project
index 855e78deec..855e78deec 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/.project
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/.project
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/LICENSE
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/NOTICE
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/pom.xml
index 39fcbada89..39fcbada89 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/pom.xml
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index c7b6caf466..c7b6caf466 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
index afef327291..afef327291 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
index 4bac565fdd..4bac565fdd 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
index 4110e7e9d3..4110e7e9d3 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index de8278ced9..de8278ced9 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index f14016eae4..f14016eae4 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index cf04398c16..cf04398c16 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index cb08ef15e2..cb08ef15e2 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3adbec0f97..3adbec0f97 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4767358e7a..4767358e7a 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
index 8eb477c2e5..8eb477c2e5 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
index d34784905d..d34784905d 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
index 748768419d..748768419d 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index f7ed9d1d27..f7ed9d1d27 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
index 491b42c69c..491b42c69c 100644
--- a/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
diff --git a/branches/sca-android-r643746/modules/contribution-impl/.classpath b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/.classpath
index 55f73705a4..55f73705a4 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/.classpath
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/.classpath
diff --git a/branches/sca-android-r643746/modules/contribution-impl/.project b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/.project
index 3960f1489e..3960f1489e 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/.project
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/.project
diff --git a/branches/sca-android-r643746/modules/contribution-impl/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/contribution-impl/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/LICENSE
diff --git a/branches/sca-android-r643746/modules/contribution-impl/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/NOTICE
diff --git a/branches/sca-android-r643746/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/pom.xml
index 1f8855dca9..1f8855dca9 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/pom.xml
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java
index 83c209180d..83c209180d 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
index 6793855efc..6793855efc 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
index 785f31c72a..785f31c72a 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
index 3425864c62..3425864c62 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
index ed3022bb3b..ed3022bb3b 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
index 956251b2f6..956251b2f6 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
index 0ee8cd6aac..0ee8cd6aac 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
index 6cbdc87d55..6cbdc87d55 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index b644709266..b644709266 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
index f2a7aa6cb9..f2a7aa6cb9 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
index 0f234e09fe..0f234e09fe 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index 7fd9cc183a..7fd9cc183a 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
index ea157489f6..ea157489f6 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
index a180d11adb..a180d11adb 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
index c60bcaa0cc..c60bcaa0cc 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
index 6d33db5810..6d33db5810 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
index 124a3a8b1b..124a3a8b1b 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/test.composite b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/test.composite
diff --git a/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/test.ext b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/test.ext
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution-impl/src/test/resources/test.ext
diff --git a/branches/sca-android-r643746/modules/contribution/.classpath b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/.classpath
index 732ae371c2..732ae371c2 100644
--- a/branches/sca-android-r643746/modules/contribution/.classpath
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/.classpath
diff --git a/branches/sca-android-r643746/modules/contribution/.project b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/.project
index 24cbaf4abb..24cbaf4abb 100644
--- a/branches/sca-android-r643746/modules/contribution/.project
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/.project
diff --git a/branches/sca-android-r643746/modules/contribution/.settings/org.eclipse.jdt.core.prefs b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/.settings/org.eclipse.jdt.core.prefs
index 8fc9b863cf..8fc9b863cf 100644
--- a/branches/sca-android-r643746/modules/contribution/.settings/org.eclipse.jdt.core.prefs
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/.settings/org.eclipse.jdt.core.prefs
diff --git a/branches/sca-android-r643746/modules/contribution/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/contribution/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/contribution/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/contribution/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/LICENSE
diff --git a/branches/sca-android-r643746/modules/contribution/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/contribution/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/NOTICE
diff --git a/branches/sca-android-r643746/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/pom.xml
index a09a28bd5d..a09a28bd5d 100644
--- a/branches/sca-android-r643746/modules/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/pom.xml
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index ad2dbace5e..ad2dbace5e 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index f3d2b62fc1..f3d2b62fc1 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index 1bc4cc7b9e..1bc4cc7b9e 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index 31fccb6f4c..31fccb6f4c 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
index 73df82b8b5..73df82b8b5 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
index 7d56f37472..7d56f37472 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
index 3cde4788d7..3cde4788d7 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index 43d2b54a3d..43d2b54a3d 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 1f60ba8073..1f60ba8073 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
index 96decab6da..96decab6da 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index f1e7147959..f1e7147959 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index 43a6586815..43a6586815 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index c545fd6e08..c545fd6e08 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index 3239bfd003..3239bfd003 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index f9116134fa..f9116134fa 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
index cf5956a8e7..cf5956a8e7 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index 832a82a4f0..832a82a4f0 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index 68dcf8dbad..68dcf8dbad 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
index 2a98478109..2a98478109 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index f9c21947f7..f9c21947f7 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index 574ffc5f04..574ffc5f04 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
index dcb2c05186..dcb2c05186 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index e27add9b81..e27add9b81 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
index 0b1587d10a..0b1587d10a 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index ea2bfdd3ac..ea2bfdd3ac 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index c399800459..c399800459 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
index e4034c358e..e4034c358e 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
index 97fd5fee76..97fd5fee76 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index 62e6bd0f86..62e6bd0f86 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 0bf0f81b5e..0bf0f81b5e 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index 07e71aba5a..07e71aba5a 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 653b0ed637..653b0ed637 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index 8d5e2f33db..8d5e2f33db 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
index 8316786ce0..8316786ce0 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index 235e542e52..235e542e52 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
index e8a9edb275..e8a9edb275 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
index e8e635ad07..e8e635ad07 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index 471cfde136..471cfde136 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index 92cae94997..92cae94997 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index 9eaaef6e9b..9eaaef6e9b 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
index e17e815064..e17e815064 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
index 941837d862..941837d862 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index b754de11fd..b754de11fd 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
index c78872e5af..c78872e5af 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index 97ddabda19..97ddabda19 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
index 6ce3e307ca..6ce3e307ca 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
index e46a6b8b40..e46a6b8b40 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
index cbe9cf29b0..cbe9cf29b0 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
index eff3f59b40..eff3f59b40 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
index 1fbfedfd97..1fbfedfd97 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
index cbfaac370f..cbfaac370f 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
index 5ff34dea8a..5ff34dea8a 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
index 86f0523264..86f0523264 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
index 30bfe8d1cd..30bfe8d1cd 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
index d6390c9250..d6390c9250 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
index cba24e7b37..cba24e7b37 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
index 28ea8a92ad..28ea8a92ad 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
index 9c6fbcce2f..9c6fbcce2f 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
index 4744fcd811..4744fcd811 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
index ba549b22a9..ba549b22a9 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
index bcc346d9f8..bcc346d9f8 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
index 6b4d2ebdeb..6b4d2ebdeb 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
index 9e6433ba6c..9e6433ba6c 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
index 7609eda0d1..7609eda0d1 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
index 8ea5fc0a7e..8ea5fc0a7e 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
index 9d78ca93d0..9d78ca93d0 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
index ae6e876df6..ae6e876df6 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
index 4bb65e55e7..4bb65e55e7 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
index 727f8f6ce7..727f8f6ce7 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
diff --git a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
index 6e61bebf79..6e61bebf79 100644
--- a/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
diff --git a/branches/sca-android-r643746/modules/core-databinding/.classpath b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/.classpath
index 57c14f73d6..57c14f73d6 100644
--- a/branches/sca-android-r643746/modules/core-databinding/.classpath
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/.classpath
diff --git a/branches/sca-android-r643746/modules/core-databinding/.project b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/.project
index 1ff4bcab93..1ff4bcab93 100644
--- a/branches/sca-android-r643746/modules/core-databinding/.project
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/.project
diff --git a/branches/sca-android-r643746/modules/core-databinding/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/core-databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/LICENSE
diff --git a/branches/sca-android-r643746/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/NOTICE
diff --git a/branches/sca-android-r643746/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/pom.xml
index 2d0facb551..2d0facb551 100644
--- a/branches/sca-android-r643746/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/pom.xml
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index d936de20ab..d936de20ab 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index 05d1d71558..05d1d71558 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index e33b7ffbfa..e33b7ffbfa 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 0c1721ae08..0c1721ae08 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index b8ec19b985..b8ec19b985 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 7fed2e5eaa..7fed2e5eaa 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index 0dbe92dfa4..0dbe92dfa4 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 193ba98283..193ba98283 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index 3e0741d0a7..3e0741d0a7 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index ea08166dfe..ea08166dfe 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
index be2f3fe7cb..be2f3fe7cb 100644
--- a/branches/sca-android-r643746/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
diff --git a/branches/sca-android-r643746/modules/core-spi/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/core-spi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/LICENSE
diff --git a/branches/sca-android-r643746/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/NOTICE
diff --git a/branches/sca-android-r643746/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/pom.xml
index 72cfbe7a7c..72cfbe7a7c 100644
--- a/branches/sca-android-r643746/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/pom.xml
diff --git a/branches/sca-android-r643746/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index 93fc219903..93fc219903 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index 822c9ccd84..822c9ccd84 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 8cd0978ff0..8cd0978ff0 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index fc8119578c..fc8119578c 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 5435255708..5435255708 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index efc2f80dc7..efc2f80dc7 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 537c9d69d8..537c9d69d8 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index 1893dc57cc..1893dc57cc 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 0aa922afa0..0aa922afa0 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index 00f6961235..00f6961235 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index 4a204efdd1..4a204efdd1 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index e540ef683e..e540ef683e 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index 177dcfbb77..177dcfbb77 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index dec01a119b..dec01a119b 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5d6daab23..a5d6daab23 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 37d15a8704..37d15a8704 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 95efa3d259..95efa3d259 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index b28f6ad483..b28f6ad483 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 9a452b5d54..9a452b5d54 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index 82b994577f..82b994577f 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 49bceac82b..49bceac82b 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 900450f206..900450f206 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 371f9c9af2..371f9c9af2 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
index 4cca3b1e32..4cca3b1e32 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index a9f86c45ca..a9f86c45ca 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 084056278c..084056278c 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index 7e798549b3..7e798549b3 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index b7306e48dd..b7306e48dd 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index d7e4fee1d9..d7e4fee1d9 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index e0c03b3db1..e0c03b3db1 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index 63c8cc162b..63c8cc162b 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index d0a1b53563..d0a1b53563 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
index b85d19ba9a..b85d19ba9a 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
index 9be99c389c..9be99c389c 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
index 4d91480295..4d91480295 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index db08098ae8..db08098ae8 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index fb58c72262..fb58c72262 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index 0e7a1ce103..0e7a1ce103 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index b4ec354988..b4ec354988 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index f640d9a227..f640d9a227 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index f10c6c6e5d..f10c6c6e5d 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index f30c92452b..f30c92452b 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 002bc90010..002bc90010 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index 104a490fa4..104a490fa4 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index a828995c5a..a828995c5a 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 30630cc2af..30630cc2af 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 465b385d57..465b385d57 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 728faf5d0c..728faf5d0c 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index 45bce4d8fb..45bce4d8fb 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 24f8c1a8fd..24f8c1a8fd 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 8798f31138..8798f31138 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 7cbf4c5ea6..7cbf4c5ea6 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index 9e05090845..9e05090845 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index 024c3af2f0..024c3af2f0 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
index 2f700671ca..2f700671ca 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-android-r643746/modules/core/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/core/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/core/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/core/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/LICENSE
diff --git a/branches/sca-android-r643746/modules/core/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/core/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/NOTICE
diff --git a/branches/sca-android-r643746/modules/core/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/core/pom.xml
index 0d0ee2c606..0d0ee2c606 100644
--- a/branches/sca-android-r643746/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/pom.xml
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index 1e68564d1d..1e68564d1d 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index a96abce839..a96abce839 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index f730b2ff71..f730b2ff71 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 2d7cfefd16..2d7cfefd16 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index 7087df2a42..7087df2a42 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index e500e8ee20..e500e8ee20 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 5d7eab26fa..5d7eab26fa 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 68312e50f4..68312e50f4 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index f8c80135c8..f8c80135c8 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index 0393d31d61..0393d31d61 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index bd8f5e0aa1..bd8f5e0aa1 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index 7019c8c7d3..7019c8c7d3 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index bcf9a366c6..bcf9a366c6 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 9a94d6dff8..9a94d6dff8 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index d0fc6c969f..d0fc6c969f 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index 217e327184..217e327184 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index 08e69230da..08e69230da 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index fde3831cdf..fde3831cdf 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index a238ce3d4e..a238ce3d4e 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index 36a6dbcc5f..36a6dbcc5f 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index a262f311ef..a262f311ef 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 7d37ed496e..7d37ed496e 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index f9702abced..f9702abced 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index 5b347166b5..5b347166b5 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 936717d7fd..936717d7fd 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 7770c9133b..7770c9133b 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index 195971dc8f..195971dc8f 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index 99ec0d2bef..99ec0d2bef 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index c80dc19676..c80dc19676 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 4bbadff869..4bbadff869 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 100bf05d32..100bf05d32 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index 56df7d10a9..56df7d10a9 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index bacd652402..bacd652402 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index da8ce41ce7..da8ce41ce7 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 9b5e564081..9b5e564081 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 96ce410539..96ce410539 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 40ee01a434..40ee01a434 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index dfc3dcc95d..dfc3dcc95d 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index 3ccd357db7..3ccd357db7 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index e41b18c290..e41b18c290 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index c201b37a51..c201b37a51 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 3fa636ed26..3fa636ed26 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index a5f9cdc84a..a5f9cdc84a 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index 5c9ae8c706..5c9ae8c706 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index 4bc18fe80a..4bc18fe80a 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index 3dfc435e00..3dfc435e00 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index 4380dc18ab..4380dc18ab 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 786e91a788..786e91a788 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index fb476c3c7b..fb476c3c7b 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index eca2279024..eca2279024 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index e98c6ac9a8..e98c6ac9a8 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index 50b4b59d73..50b4b59d73 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index 8e8a89c963..8e8a89c963 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index b7cfb2c4c9..b7cfb2c4c9 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cd59fdb0aa..cd59fdb0aa 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 20ea4ca379..20ea4ca379 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 7ca30718b5..7ca30718b5 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 00bf9c831e..00bf9c831e 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index d5085289e9..d5085289e9 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index d6ce9b4582..d6ce9b4582 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 3e981556dc..3e981556dc 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index cad9279e5c..cad9279e5c 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index c9693761e8..c9693761e8 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 55244932c5..55244932c5 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index 487d2874b0..487d2874b0 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 62f1e3fb79..62f1e3fb79 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index c42700c9a6..c42700c9a6 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index 761430597c..761430597c 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index c2a3172fe2..c2a3172fe2 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 1c72359e58..1c72359e58 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index ea91c5973c..ea91c5973c 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index e5f23f9a0a..e5f23f9a0a 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 6ec5667cb1..6ec5667cb1 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 6c25dbd2d4..6c25dbd2d4 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 8708c6e11e..8708c6e11e 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c533822952..c533822952 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index f785647683..f785647683 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 7507248b32..7507248b32 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index a3c4e7ee1a..a3c4e7ee1a 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 29f43ed861..29f43ed861 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index b8b1d6bbe3..b8b1d6bbe3 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index d669711c40..d669711c40 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index bed8f14cdc..bed8f14cdc 100644
--- a/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-android-r643746/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-android-r643746/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index b3d1d42ed3..b3d1d42ed3 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index d4cc0e64d8..d4cc0e64d8 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 13f5c14c77..13f5c14c77 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index b8a9d5a591..b8a9d5a591 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index a309ac4b15..a309ac4b15 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 5601d18746..5601d18746 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index 3725ce74b0..3725ce74b0 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 424f12800f..424f12800f 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 120fe861c8..120fe861c8 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index 971d9493c8..971d9493c8 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 504313921c..504313921c 100644
--- a/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-android-r643746/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index 1f2218aba8..1f2218aba8 100644
--- a/branches/sca-android-r643746/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/branches/sca-android-r643746/modules/extensibility/.classpath b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/.classpath
index 4bd80ca1d6..4bd80ca1d6 100644
--- a/branches/sca-android-r643746/modules/extensibility/.classpath
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/.classpath
diff --git a/branches/sca-android-r643746/modules/extensibility/.project b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/.project
index 7e1a2e5ff6..7e1a2e5ff6 100644
--- a/branches/sca-android-r643746/modules/extensibility/.project
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/.project
diff --git a/branches/sca-android-r643746/modules/extensibility/.settings/org.eclipse.jdt.core.prefs b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/.settings/org.eclipse.jdt.core.prefs
index af3f96beaa..af3f96beaa 100644
--- a/branches/sca-android-r643746/modules/extensibility/.settings/org.eclipse.jdt.core.prefs
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/.settings/org.eclipse.jdt.core.prefs
diff --git a/branches/sca-android-r643746/modules/extensibility/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/extensibility/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/extensibility/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/extensibility/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/LICENSE
diff --git a/branches/sca-android-r643746/modules/extensibility/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/NOTICE
index 65c52d01c7..65c52d01c7 100644
--- a/branches/sca-android-r643746/modules/extensibility/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/NOTICE
diff --git a/branches/sca-android-r643746/modules/extensibility/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/pom.xml
index 991ee1aeaf..991ee1aeaf 100644
--- a/branches/sca-android-r643746/modules/extensibility/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/pom.xml
diff --git a/branches/sca-android-r643746/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index ff7d215d2e..ff7d215d2e 100644
--- a/branches/sca-android-r643746/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-android-r643746/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index a7358590de..a7358590de 100644
--- a/branches/sca-android-r643746/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/host-embedded/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/host-embedded/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/host-embedded/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/LICENSE
diff --git a/branches/sca-android-r643746/modules/host-embedded/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/host-embedded/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/NOTICE
diff --git a/branches/sca-android-r643746/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/pom.xml
index 224bd104c1..224bd104c1 100644
--- a/branches/sca-android-r643746/modules/host-embedded/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/pom.xml
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
index b45b418ccf..b45b418ccf 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
index 1bb0662118..1bb0662118 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
index a1f272cb06..a1f272cb06 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
index acd0fb91e4..acd0fb91e4 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 5f73dbe008..5f73dbe008 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
index 647443a88e..647443a88e 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
index bc2edb7de9..bc2edb7de9 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
index ffee6122d9..ffee6122d9 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
index 4f155473d8..4f155473d8 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
index 01adc4df82..01adc4df82 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
index b5e41dd097..b5e41dd097 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
index 10491df403..10491df403 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
index 67743517c2..67743517c2 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
index 7f29553994..7f29553994 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
index 6e71295044..6e71295044 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
index 10c174a00b..10c174a00b 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
index 3a215e537d..3a215e537d 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
index 5aea0a1dd1..5aea0a1dd1 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
index 4173d1b4e0..4173d1b4e0 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
index 3ed64536ef..3ed64536ef 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java b/sca-java-1.x/branches/sca-android-r643746/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-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java b/sca-java-1.x/branches/sca-android-r643746/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-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java b/sca-java-1.x/branches/sca-android-r643746/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-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java b/sca-java-1.x/branches/sca-android-r643746/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-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android-r643746/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-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java b/sca-java-1.x/branches/sca-android-r643746/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-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 7e2e11e4cc..7e2e11e4cc 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/resources/test.composite b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/resources/test.composite
index fcd33d3fcb..fcd33d3fcb 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/resources/test.composite
diff --git a/branches/sca-android-r643746/modules/host-embedded/src/test/resources/test.txt b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/resources/test.txt
index 7b13a7e01f..7b13a7e01f 100644
--- a/branches/sca-android-r643746/modules/host-embedded/src/test/resources/test.txt
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/pom.xml
index cf450f3fc2..cf450f3fc2 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index 7f531a7e8a..7f531a7e8a 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index c1d2a14ddd..c1d2a14ddd 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index 092736918a..092736918a 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index e7a5b3de03..e7a5b3de03 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 00bcdcbbc1..00bcdcbbc1 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index 0c91f31cc2..0c91f31cc2 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index f326ed4748..f326ed4748 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index a1cfa6c98d..a1cfa6c98d 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index edd003f196..edd003f196 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index f1fef2149e..f1fef2149e 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index e8bed559d0..e8bed559d0 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 0b97f3eb8b..0b97f3eb8b 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 89c845cd00..89c845cd00 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index 947db7110d..947db7110d 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index df71a24a07..df71a24a07 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index e8391f9e90..e8391f9e90 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index 4cd1e9fc18..4cd1e9fc18 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index ae2f71ba12..ae2f71ba12 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index fc33e8a005..fc33e8a005 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 4b6c061cbd..4b6c061cbd 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index 67e161df53..67e161df53 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 10a8195742..10a8195742 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index fd6376cd58..fd6376cd58 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 1ac7859e3e..1ac7859e3e 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index f8a9a6b3c4..f8a9a6b3c4 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index fd569e43aa..fd569e43aa 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index a6206ec0f8..a6206ec0f8 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index 406c95524f..406c95524f 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index a444b56846..a444b56846 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index f42a264c38..f42a264c38 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
index 1163c364c9..1163c364c9 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index e1a0c6d326..e1a0c6d326 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index a7b175cf9b..a7b175cf9b 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
index 210068841b..210068841b 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index ff7e906121..ff7e906121 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index 0323c15b09..0323c15b09 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
index c9b1987f25..c9b1987f25 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
index ef338297ef..ef338297ef 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index 1f34fc5e12..1f34fc5e12 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 4b7f78aabf..4b7f78aabf 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index ca2755f811..ca2755f811 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index 3b25724694..3b25724694 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
index 76947c2488..76947c2488 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index 2132e3c3e1..2132e3c3e1 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 59c810e7f0..59c810e7f0 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index 08b7bfacbe..08b7bfacbe 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index 12591b2382..12591b2382 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index 0ace1336df..0ace1336df 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index 46ab21eca7..46ab21eca7 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a6d2787a45..a6d2787a45 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index 7b3b5f0a36..7b3b5f0a36 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 4923233ea9..4923233ea9 100644
--- a/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/pom.xml
index 549570e238..549570e238 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 85cf3d7d0a..85cf3d7d0a 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index d66266fc0d..d66266fc0d 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android-r643746/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-r643746/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index 2e7d6a5ed1..2e7d6a5ed1 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index f5df6a42e8..f5df6a42e8 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index 58d31bf217..58d31bf217 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index 959312b464..959312b464 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index 970d0c4d83..970d0c4d83 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index c1d867c687..c1d867c687 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 3336723dc0..3336723dc0 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index 3de8c80bd4..3de8c80bd4 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 0603553384..0603553384 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index 3d92031c65..3d92031c65 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index cddc134c2c..cddc134c2c 100644
--- a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-1.x/branches/sca-android-r643746/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-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/branches/sca-android-r643746/modules/implementation-java/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/implementation-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/implementation-java/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/implementation-java/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/LICENSE
diff --git a/branches/sca-android-r643746/modules/implementation-java/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/implementation-java/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/NOTICE
diff --git a/branches/sca-android-r643746/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/pom.xml
index 3130bd2890..3130bd2890 100644
--- a/branches/sca-android-r643746/modules/implementation-java/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/pom.xml
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index ea3d9f0b59..ea3d9f0b59 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index 06cfabeb44..06cfabeb44 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index fac3f9a0dd..fac3f9a0dd 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 1b90be3043..1b90be3043 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index f6695bde6d..f6695bde6d 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 61fe2a1f0b..61fe2a1f0b 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 5524c12c18..5524c12c18 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index ff269713df..ff269713df 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index 1ed5045429..1ed5045429 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index 35f8920b33..35f8920b33 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 169f7fd6e3..169f7fd6e3 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index cf1bf096dd..cf1bf096dd 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index fb59566222..fb59566222 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 0b80b59600..0b80b59600 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index fac5643eed..fac5643eed 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 8af1256a17..8af1256a17 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index c6ac1cd69c..c6ac1cd69c 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index 3928f59482..3928f59482 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
index 79f90baece..79f90baece 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 6acaa3e17d..6acaa3e17d 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 739445c90a..739445c90a 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 1c34a50762..1c34a50762 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index 2db58006e6..2db58006e6 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index 8ad0b7cc43..8ad0b7cc43 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 9e0ce3e427..9e0ce3e427 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index dd879e66fa..dd879e66fa 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index c137de4e4a..c137de4e4a 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 962bd5a5d3..962bd5a5d3 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index 2fa4428a1f..2fa4428a1f 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 20ec93448c..20ec93448c 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 9864402b12..9864402b12 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 6b6f6579d9..6b6f6579d9 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 277313606f..277313606f 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index f0e0f65587..f0e0f65587 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index 14124f0b31..14124f0b31 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index f85cc40248..f85cc40248 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 010713d14f..010713d14f 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 21ebd433a7..21ebd433a7 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 8a50d978e3..8a50d978e3 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index 9c96567844..9c96567844 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index 4281cfe358..4281cfe358 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 94ceb2d3a5..94ceb2d3a5 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index ec3c2c4bb6..ec3c2c4bb6 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index bb460e2840..bb460e2840 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 11100cf45e..11100cf45e 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e416f09f85..e416f09f85 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index b1168a586a..b1168a586a 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 736bc6e691..736bc6e691 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index d800450453..d800450453 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index a54c418af8..a54c418af8 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index d7a8746c05..d7a8746c05 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index c96240c82b..c96240c82b 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index c801c92092..c801c92092 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index aa3c595d40..aa3c595d40 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index a7822cf150..a7822cf150 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index b2492e60fb..b2492e60fb 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 659f629be5..659f629be5 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index 2c355fae72..2c355fae72 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 096ec970eb..096ec970eb 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index dc9de12632..dc9de12632 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index 5691c773a5..5691c773a5 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index 809f992e7f..809f992e7f 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index c48977d201..c48977d201 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index 5be57dcca5..5be57dcca5 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 252c7c725d..252c7c725d 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index c794b0a800..c794b0a800 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index e35168180c..e35168180c 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index d1dfb2fb0c..d1dfb2fb0c 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index 3df561ef33..3df561ef33 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 6dc91bec22..6dc91bec22 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index 41d277e377..41d277e377 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index 5ff99b1265..5ff99b1265 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 032b821c79..032b821c79 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index dac4d1864f..dac4d1864f 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index 48c11c5c87..48c11c5c87 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index 976de72ae7..976de72ae7 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 9fb7b57f2e..9fb7b57f2e 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index a064f081d5..a064f081d5 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
index d138a03f33..d138a03f33 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index 044437959b..044437959b 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 8df2b5cb16..8df2b5cb16 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 47ca01a63a..47ca01a63a 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index 91a3d7e7e4..91a3d7e7e4 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 02bebca8eb..02bebca8eb 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index 63a02614fc..63a02614fc 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 9e3db807ba..9e3db807ba 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index 1ffae27129..1ffae27129 100644
--- a/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/.classpath b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/.classpath
index c86b7b792b..c86b7b792b 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/.classpath
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/.classpath
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/.project b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/.project
index 6390d9d016..6390d9d016 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/.project
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/.project
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/LICENSE
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/NOTICE
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/pom.xml
index e8d83e816e..e8d83e816e 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/pom.xml
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
index dbbc7b4635..dbbc7b4635 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index f25425f286..f25425f286 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
index 9a31cb6127..9a31cb6127 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
index b41ff14af0..b41ff14af0 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
index 34c8d2c67d..34c8d2c67d 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
index 7e4114d854..7e4114d854 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
index b0478f6c71..b0478f6c71 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
index 9597cd892b..9597cd892b 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
diff --git a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
index 87f75cca39..87f75cca39 100644
--- a/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-android-r643746/modules/interface-java/.classpath b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/.classpath
index 553679d82e..553679d82e 100644
--- a/branches/sca-android-r643746/modules/interface-java/.classpath
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/.classpath
diff --git a/branches/sca-android-r643746/modules/interface-java/.project b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/.project
index cdc464f4dd..cdc464f4dd 100644
--- a/branches/sca-android-r643746/modules/interface-java/.project
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/.project
diff --git a/branches/sca-android-r643746/modules/interface-java/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/interface-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/interface-java/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/interface-java/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/LICENSE
diff --git a/branches/sca-android-r643746/modules/interface-java/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/interface-java/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/NOTICE
diff --git a/branches/sca-android-r643746/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/pom.xml
index a197b7bd77..a197b7bd77 100644
--- a/branches/sca-android-r643746/modules/interface-java/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/pom.xml
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 7c4d6ea400..7c4d6ea400 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 58297d3746..58297d3746 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index 012834afd9..012834afd9 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 0559e7c7f2..0559e7c7f2 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index e34f109272..e34f109272 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index 67bf167aa3..67bf167aa3 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index 79b76eaa3f..79b76eaa3f 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 0ff0e174b5..0ff0e174b5 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index a0292d3327..a0292d3327 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 328fc38ee9..328fc38ee9 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
index 6853f7931d..6853f7931d 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
index cba865593d..cba865593d 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 49f019a9d2..49f019a9d2 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
index 5ba12ec137..5ba12ec137 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index d86c029863..d86c029863 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
index 62c1105d50..62c1105d50 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
index d230b55fa3..d230b55fa3 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
diff --git a/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
index 71e4fb3cf4..71e4fb3cf4 100644
--- a/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/DISCLAIMER b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-android-r643746/modules/policy-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/DISCLAIMER
diff --git a/branches/sca-android-r643746/modules/policy-xml/LICENSE b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android-r643746/modules/policy-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/LICENSE
diff --git a/branches/sca-android-r643746/modules/policy-xml/NOTICE b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android-r643746/modules/policy-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/NOTICE
diff --git a/branches/sca-android-r643746/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/pom.xml
index 8373592b49..8373592b49 100644
--- a/branches/sca-android-r643746/modules/policy-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/pom.xml
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index b54adf492b..b54adf492b 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index e588f93663..e588f93663 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index a69e3aca3a..a69e3aca3a 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 655b592665..655b592665 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index 53231f704e..53231f704e 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index cf58964a89..cf58964a89 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index 4ad09baf55..4ad09baf55 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index cf4eef074f..cf4eef074f 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index 1977e544c4..1977e544c4 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0741e3eb76..0741e3eb76 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
index 56d9a1eba8..56d9a1eba8 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 15b1eb149c..15b1eb149c 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
index ce999539bb..ce999539bb 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-android-r643746/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index e01a29863a..e01a29863a 100644
--- a/branches/sca-android-r643746/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-android-r643746/modules/retrotranslator_readme b/sca-java-1.x/branches/sca-android-r643746/modules/retrotranslator_readme
index 93e1a611cc..93e1a611cc 100644
--- a/branches/sca-android-r643746/modules/retrotranslator_readme
+++ b/sca-java-1.x/branches/sca-android-r643746/modules/retrotranslator_readme